Revert "undo re-order"

This reverts commit 511a4a66b04e52603319420eb7ed537fde7fa797.