Close this PR then, the impact of this change either way is not huge. Let's deprecate it, fix add-on builder helper and close this issue as wontfix.