Comment 3 for bug 1269880

I've committed a fix in r1269880, but I'm going to check with other developers as it's seems a little too easy and is probably leaking memory. But it does work.