Revert Kbuild to original version