vkernel: revert two commits that break i386 vkernel