Reverting #102

Since base url is not working properly, at least for @regnarock and @brissa-a, it shouldn't be merged into the master. Please test PR locally before a blind merge.