Revert "Do not need base url"

This reverts commit 38cfd957d82265dffe0ef2a04490bce787c69bef.