Fix bad merge when backing out mock.