Finally removed all calls to the standard URL parser. Ticket #30