Revert some undesired changes