Revert "Correct g2 defconfig"

This reverts commit 0aeffe28f28a6d5c4618f74d60b5ccd6a621a723.