This reverts commit f87d72f5 as that is
part of a patchset reported to break cleanup and migration.

Cc: Gal Hammer <ghammer@redhat.com>
Cc: Sitong Liu <siliu@redhat.com>
Cc: Xiaoling Gao <xiagao@redhat.com>
Suggested-by: NGreg Kurz <groug@kaod.org>
Suggested-by: NPaolo Bonzini <pbonzini@redhat.com>
Reported-by: NJose Ricardo Ziviani <joserz@linux.vnet.ibm.com>
Reported-by: NDaniel Henrique Barboza <danielhb@linux.vnet.ibm.com>