Reverting legacy promotion removal on master