Fixes for Travis: its using Rails4
Undo URI.escape, it breaks already escaped URIs