Revert r299467 to fix the kernel build.
$ svn merge -c -299467 .
Approved by: build being broken for six hours