The upstream bug was closed as wont fix and seems most distros reverted the offending patch. Closing as wont fix.