Rolling back fix until I figure out why it broke tests on the server but not locally