Undo some unintended changes