Revert rest of changes