This reverts commit 7a68fd46. I was incorrect on how on_setup_env works, reverting to the correct way to do things.
