Fixing config issues and adding locationID2 support
Revert "Fixing config issues and adding locationID2 support"

This reverts commit 550d86f39953d4cf2851a79a8b5f5d291ea36e33.