This is starting to look like a duplicate of bug 62959. Can you try attachment 77608 [details] [review]? That seems to fix 62959, hopefully it will fix this one as well.