These recent commits shouldn't be removed.