Repair special cases for #84294