Refactoring to r89566