Repair GCM support for premium #684