Revert "Enhanced ordering"
Merge pull request #6 from Bemmu/revert-5-master

Revert "Enhanced ordering"