Comment 4 for bug 1241644

Because I'm stumbling around re:rebasing, there are 2 commits on that existing branch: the one that matters ( c1e920502ded6266a322758d8964e2f96b0adbbd ) and one for a merge that can be ignored. Let me know if there's anything that doesn't work out and I'll just reapply it into a new branch.

Jason