If we're considering pushing this out in 2.1.x then we might want to keep this method in order to minimise API changes.