Peter,
Basically the Custom IP column of the a_client_connection_info table needs to be updated to their internal IP or the internal ip needs to be on the Last known IP field. At that point the outbound will try GCM and fail, and then try the ip address.