Revert "Remove GM from 3.0"

This reverts commit a4c93fef05493e6210e8d3d72af7b6d492f4e121.