Monkey Patch URI because Google Hates Us
Merge branch 'rackemdanno' into development