Revert "Revert "g""

This reverts commit 842407fa0ef9c63abc127da3fecda83cb8739680.