This reverts commit 349326db275da7f7f507540ccecb2780ac655fe9. Makes the system unbootable on my gcc2 BIOS machine.