This actually existing code that was moved around as part of the legacy promotion removal.  
Propose that we address this in a separate PR.