Reverting change in 39355, that is we do want to put the vertex objects in GRP/Calib...