Backed out changeset 422fd81a4118 (bug 1032125) for causing regressions / Bug 1070850
Backed out changeset e193cf8cb616 (bug 1032125) for causing regressions
Backed out changeset 0b73bd6d5d9c (bug 1032125) for causing regressions