Undefined URL follow-up
Reverting config changes
Merge pull request #1 from nicolaasmatthijs/issue-641

Follow up on #641