Backed out changeset ce62de041fca (bug 1860041) for causing failures on test_focus_di...