Bug#819751:

[Michael Lustfield]

Thanks for raising this concern and re-opening the ticket as it wasn't
properly addressed previously.

Our good friend Christos has been working on a better solution and I
would expect to see that somewhat soon.