Fix busted comment
Restore support for G1..G3