Comment 7 for bug 1836188

The patch was pending in upstream for too long, so I decided to apply it locally in our repo first.

We can revert this once it's accepted upstream.

https://kernel.ubuntu.com/git/ubuntu/autotest-client-tests.git/commit/?id=fa0b9ed6b81e0cb3d7bbeb980559edec01b27b51