This reverts commit 78ca1108b1. It is causing boot failures with qemu mac99 in at least some configurations.
78ca1108b1