This reverts commit 559bbe6c.

Michael S. Tsirkin reports that this changes breaks suspend/resume.
Signed-off-by: NJeff Garzik <jgarzik@redhat.com>