Revert "Repair x86/x86_64 kconfig madness"

This reverts commit 9c69e3361f95a65adfd61ea77fcd829d46ceb969.