Given that Google doesn't seem inclined to fix this issue anytime soon, I have committed the local patch I have to CSSU Git (although mostly I did it just to get it out of my tree so I wouldn't loose it when fiddling with NSS stuff)