Revert "reorder"

This reverts commit 27027d507aa818a5c2ff78c8e15306f3cda5b49d.