Comment 11 for bug 731878

Tim, we've got the same train of thought :) I'm planning to keep an on on the upstream thread and if no solution presents itself I'll revert this patch prior to our final upload before kernel freeze.