kbuild: Revert part of e8d400a to resolve a conflict