Comment 33 for bug 988079

I think comment #30 shows the primary problem we should focus on here. If you agree then I will merge bug 1005074 into this one.