Checkpoint a dead-end to be backed out in next commit.