Revert "Config Changes"

This reverts commit db61f26970a6c767f2e9171ca31a04374f34dce4.
Revert "Revert "Config Changes""

This reverts commit c7f6f2e9f41213da0cb162f43a7c058a3e84103b.