Revert "Revert "Revert "switch order"""

This reverts commit 0203b7a900524b28d1c7ebf5bab7282086610b56.

Change-Id: I5b467206f3480140faac5b36e9de138bfd63cef8