Backport of #2910 to 70x

This is a backport of #2910 to 70x. The same comments apply here.