Comment 3 for bug 1479207

Okay, based on the conversation in the Debian bug, I have a patch that fixes this regression, and doesn't regress the previous fix. SRUing to trusty to fix my point release, and will cover the other releases and maybe even write test cases for the testsuite when things calm down a tiny bit.