Revert 6c06532..6c4fb40

This rolls back to commit 6c065328dfb820fad860b8b1542b3c629bc74f1c.
config