Revert r348518
It should not have happened. The change is actually in upstream and I misread the diffs.