Revert "more ga"

This reverts commit 442e3ca75395c0c3d7b4bd95ad3b84cbdf692d09.