Comment 9 for bug 1243636

Patch works for me on 3.12-rc6.

Thanks Colin and Tyler!