Comment 20 for bug 1894772

I've tested above patch on queens qemu. and it works fine.

I don't have to fix Mitaka anymore.

if this patch is viable, we need to put this to every release since Queens. if not, migration from patched one to unpatched one will not work as I saw between Mitaka and Queens.