Revert "Update Kconfig"

This reverts commit 5ab8a6f7e2c0adf48eade4c284f78425ed9e7268.
Revert "Update Makefile"

This reverts commit 35a5ab4b3ca362e34e7827aca3fad6a732e80e50.