Revert "Revert "switch order""

This reverts commit 4199e2fe9aade4e65ada6bcc9e0dad7affa2d908.

Change-Id: I6a5da6d54ff0fccdb7e1387501e7db630fef0ebd