It's refactoring, and I'm not sure that refactoring is an acceptable option for bugfixes (check that this code goes into `2.3` branch).