There is nothing related to the quality of code, you are breaking BC and it fixes nothing, so please revert it. I will NOT merge this change.