Revert "Various config changes"

This reverts commit 149e1269a12100a7625ae9c4d0b76fac9688c7b1.