Revert "Merge branch 'proper-officer-order'"

This reverts commit 7600fd8a50174a8d1947792740c2bf38fe2c7160, reversing
changes made to a77f1d5e7a076f068fb1799c115683a28a7fd048.