Alexey, this change is good, but it breaks binary compatibility that is unacceptable for 2.4.
Maybe it should be targeted to `master` instead?