Redo David's commit.