The change is not 100% clean but does not break ABI (but might create some unnecessary warnings in 3rd party code)