Roll back some changes, to make the kernel more clean