Revert some unneeded changes