Left in by mistake during development
Also changed up how base URL setting was being done by manipulating incoming request URLs instead of altering then on generation.
Closes #1506