Comment 7 for bug 1732865

I backported the patches from the upstream git rather than using the patch in here in order to stay closer to upstream. It seems it's not possible to test this in a QEMU VM and it sounds scary to try it on a real productive machine, so I'll probably just go ahead and upload it later, and then it hopefully can be verified in proposed by someone on a real machine.