Seems like if @coffee ends up wanting it, we'll need to put it behind another flag. It would not be right to make a change that would force you to build off a different branch.