#6725: Commit the right thing this time.