Revert "reorder"

This reverts commit dee1a235b74835cd11971aaf304ff06a83892585.