Bug 10050035 - Backed out changeset 0a338a551b5c to test whether this fixed the issue.