fixup changes from commit f62a6b2f from Paulo Bonzini