Revert "namespace sabconnect settings"

This reverts commit 09d13980b43d1fcfab86e0cc55dc667b5632a6a7.
proper local only handling