Undo some changes that shouldn't have been committed