Undo more git confusion