Revert "Unhoist variables"

* whoops, I assume this is only interesting to us - reverting it back out

This reverts commit 41371c1f2f12080340ab9546aa013af964859ec5.