Comment 10 for bug 903199

I talked to gholt and asked him about upstreaming his patch, so hopefully that will fix everything. If someone wants to figure out how to work around it our code that would be awesome