This reverts commit 096639c548. The kernel bug that broke this has now been fixed, and we now set CONFIG_X86_GENERIC, which would have stopped us being affected by it anyway.
096639c548