Fixed the revert. Will probably make a new branch with cleaner commits.