Is this a backport of the fix that was made in internal projects?