To be removed in v2.0 per #769