Revert "Merge branch 'orderv2'"

This reverts commit 0e5e2385b00b75f3d2759b4629455104567cc504, reversing
changes made to ee4e1807d32a2555e3c6904951b9660f03a262a7.