Comment 7 for bug 1290496

Dan's branch seems to work for me and Ben Shum reports that it also works for him.

I hesitate to push this right away because a) it lacks a pullrequest tag and b) because Dan asks for some discussion of the two points raised in the previous comment.

While I am all for better long term solutions, my main concern is there time to work one of those two solutions out before release? If not, I think we should go ahead and push this branch.