Config feature cleanup

Fixing some side effects of #1846 and #1900.
So, the module works if the feature isn't available? That seems wrong ;)