I ported that patch from Fedora 21 to Ubuntu 14.10, installed the attached 
revised patch, and am marking this as done.