Supersedes !6044 (closed)
Not working at all right now (so don't know if this actually works) due to #3474
