Revert (didn't work and it was messy anyways).