Revert "Config changes"

This reverts commit a933ceffead4ce5139daa71157318b0148573415.