Revert "Straigntening out Kconfig menu"

This reverts commit 1b2edd6b859b553e806a514056a601a759bcaefc.