Comment 50 for bug 1257186

I tried the attached patch from upstream on July 17th, but had an FTBFS in Utopic for unrelated reasons. I haven't had time to look further yet.