Comment 12 for bug 1397880

Upstream commit 1f12e32f4cd5243ae46d8b933181be0d022c6793(Commit 31c2013e4 in Xenial) has introduced a regression, reported in bug 1573231. The commit message for that commit has a bug link to this bug.

I'll ping upstream about the regression and request feedback.