Revert "Pass #2 at Kconfig clean-up"

This reverts commit 87eac87383cb5f02892f5a482fe258a5a9f32666.