Revert "Moved activity creation down."

This reverts commit b8d07ac00cb877214c45b2969857bc35788c808a.