Revert changes that were really just a bad idea...