I proposed a patch here: https://sourceware.org/bugzilla/show_bug.cgi?id=21716#c1 Please give it a try.