This reverts commit 22b58a717aad87092a7f7080805c10ef36960694. This commit causes a breakage in g3.
@stable
ng