Revert a few more Kconfig changes