Revert "GMCP update"

This reverts commit 8f8d9de8d833e86f2e9aee3a3cc1f8cee42a3e27.