undid a temporary fix

I fixed the root of the problem, so this revert removes the temporary fix