Fix the UriBuilder fix for 1.5