Revert some bad/pointless changes from 688de43