This reverts commit c82dc29a
and 4d88a2ac.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>