The fix makes things a bit awkward, but it seems to work just fine. https://bugzilla.gnome.org/show_bug.cgi?id=793399