Comment 3 for bug 1658469

I'm updating our 17.04 merge right now, I think this makes sense.