We currently call the old (deprecated) from the new one and not the other way round. Also remove a duplicated method. PiperOrigin-RevId: 309702752
