This matches the surface api we have, and closes an api gap.