Essentially the same as #16926, but for gtk3; bisects to the same commit (attn @QuLogic again :-))

wx and qt seem safe, perhaps someone on osx should check there as well...