Revert "Merge pull request #1524 from cohitre/revertOrders"

This reverts commit 645164fa6802e13733cdc91607e794d6c836b526, reversing
changes made to 03a3b6f148a74b9460c862e5c5ed81cb3f994698.

Conflicts:
	CHANGELOG.md
Merge pull request #1528 from cohitre/master

Revert "Merge pull request #1524 from cohitre/revertOrders"