Fix bug where user agent configuration gets clobberered