Fix regression induced by Surface API change.