Backed out changeset cb7f81834560 (bug 980339) since it caused bug 999080, a=lsblakk