revert [8415], seems to be causing problems for the kernel build