Fix checkpoint accidental cherry-pick. Wups.