Revert "Merge pull request #159 from One-com/baseUrlDataMain"

This reverts commit 0d9bf820f9e14b24affb195f0ac54b60f151a801, reversing
changes made to 95862ec7abc9298beec988f57cfb0b5e54d485cf.
1.6.8