Revert some changes introduced involuntarily