Yes, see #5205 . I plan here to do the whole conversion and than revert parts that should remain localized. It's much less work since I do this automatically.