Backed out changeset ed6f3ec5a71b (bug 1050667)
Backed out changeset 1193525f1f15 (bug 1050667) for causing regressions