This Reassociate change unintentionally slipped in r222499