Revert "(bad diff) Wrap with page load guard"

This reverts commit 0f2bcc543bde0208d2ac9ab1d3357abbc6fa5dcd.
(good diff now)