Revert "Minor updates to some parts of the kernel"

This reverts commit c706f506ab7f282da6982774708d24711b5f549c.