This reverts commit 6028.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6030 c046a42c-6fe2-441c-8c8c-71466251a162