In theory an incompatible change, but I think it's for the better. Impact should be relatively low. I hope. Fixes: #7676