Revert "[TASK] Config fixes"

This reverts commit 95d33d7376b8cf80f6fd785acc604de31d2804d3.