Revert "Config changes"

This reverts commit 7e35ddc20c893450e8e373eee6fc36e0158d7dc1.