do a backport of r75928