Revert "Enhanced ordering"