revert bug 931399 to see if it helps with bug 883059 at all