This reverts commit 72cf2bdb87. SYSCONF settings are getting cleared when they shouldn't be. Let's revert the change until I get proper time to figure out why it's broken.
72cf2bdb87