In the corresponding task, @tomek says he’s not sure this is an improvement. I suspect that’s because of increased code (which translates to maintenance cost) and that fact that doing this as a follow-up with no automated migration means we will probably need to skip shipping the prior builds to production. Based on those concerns I’d probably abandon it, but open to hearing a different perspective.