Revert sorting change. Messes up some tests.
Revert sorting change. Messes up some tests.

Deraen/onyx,vijaykiran/onyx,dignati/onyx,iperdomo/onyx,ideal-knee/onyx,mccraigmccraig/onyx,KevinGreene/onyx,onyx-platform/onyx,tomasu82/onyx,intfrr/onyx