user agent messages were dumped in some cases (cherry picked from commit a219159e7e18ccaa52c9c493a19a11e6b7bab3dd)