Revert "Reorder some more"

This reverts commit 83a586dc73f7d9377c36ac0a518ab91bf9489354.
This is better for reordering

Signed-off-by: anerik <anerikgames@gmail.com>