Backport of r118917