Comment 25 for bug 1246245

Yes, please merge the commit. Really frustrating on a LTS release...