[PATCH] x86: Temporarily revert parts of the Core 2 nmi nmi watchdog support