Revert "GMCP update"

This reverts commit 3855f78ad0e1951caa1e3a25c251d64c5572dc63.