Comment 63 for bug 1028151

We've decided to revert the patch submitted in bug 1012284 . To keep that patch and apply the commits mentioned in comment #49 runs the risk of introducing further regressions.

Upstream will be notified, so we can work on getting the proper fix there first.