Revert "GMCP update"

This reverts commit 7205746f64fb7cda25693b52749860f1d202725f.