Revert "GMCP update"

This reverts commit e3461bf3973f7d35023bf308533e0ee43504a260.