Revert Kconfig change