Backed out fe1213d6035d (bug 887868) because it seems to have caused bug 898713. CLOSED TREE