This reverts commit 78ca1108.

It is causing boot failures with qemu mac99 in at least some
configurations.