Revert "Try to address the global conditions slightly differently (wip)"

This reverts commit 843f5fd69ec6bf2dd0a522e980f3f55ac2df9327.

I didn't want to push this and it is broken anyway for now.