Credit @raleeper for the Comcast support (#10819)