revert some changes to mach-msm Kconfig