This reverts commit d4374439, because
it breaks the boot on several machines (mostly sparc64, at present).
Signed-off-by: NJeff Garzik <jgarzik@redhat.com>