Revert "Revert "Try removing base-url from config if no longer necessary""

This reverts commit 09b8bdecd3a035675df09f85fb1e2f4c807bb581.