Remove patch to recover lost + in URIs