Comment 153 for bug 221112

The fix has been reverted out, due to a bug report (bug #1013881) filed about it during testing in -proposed.

You guys will need to work with upstream to find a better way of fixing it that doesn't cause regressions for anyone.