Backed out changeset 1bef02988eb7 (bug 922147)
Backed out changeset 569d58c88da3 (bug 922147)