Kernel 1.1 bug fixes by reverts.