Revert "Config changes"

This reverts commit db6d0805470c0c0792ce3feab66a4a04509918c8.