Bug 1089405 - Probably fix for it (argh)