Between Michael's patch[1] for autorevert.el and this, I think the issue
should be solved.

[1]: https://debbugs.gnu.org/34847#8

Thanks,

-- 
Basil