Comment 47 for bug 1202952

No problem, I'll roll the changes and get them posted here shortly.