Refs #10622.  Checkpointing some modification.