This reverts commit 70342641. 68a235d0 relanded in abb00753, so this relands the gn port of it.
mentioned in commit 93c73d48
mentioned in commit db366f91