Revert "switch order"

This reverts commit 461cfe5d7376b0778a4d9565b457b53ff20cbd84.

Change-Id: I3a357337317646fc81420a7d8f793a5912b1a4b0