This reverts commit f3294690. That bug will be fixed in a better way via: x86: make generic arch support NUMAQ