Comment 15 for bug 1332450

Can't see how this can merge in the next few days.