Revert "GMCP update"

This reverts commit fca59e5c99c8fad1fcc715f450f8705511334d49.