Can we put it back where it was for now and leave a comment with a TODO? Moving this requires running around and making sure everything that needs to wait for page load does so (I think).