Revert "reorder"

This reverts commit dbb918dd4a8dae9f5c2ef8b237d4e11959e4f5d5.