Comment 10 for bug 1648992

I verified the test cases on yakkety-proposed.

The first test case results are a bit unusual, but they fix the regression so it's ok for now. (If you're curious, see the discussion at https://bugzilla.gnome.org/766155 )