Comment 5 for bug 1621340

Note that if a merge isn't close we can push the same fix into zesty as we do in yakkety.