Revert "GMCP update"

This reverts commit f5b1414ee56eb320f86e77586a86eda4167918e2.