Greg,
I am loath to revert a stable patch that has been there for so long as any upgrade will just cause the same bug to show back up. Why can't we just revert it in Linus's tree now and I'll take that revert in the stable trees as well?
Hannes just posted another tentative patch. I'd prefer an incremental fix if possible.