Followup r84470, fill "MW 1.15 compat"