Comment 4 for bug 1703415

Ok. Also consider backporting this to 16.04 LTS and 17.04.