Backed out changeset 61b922c31b12 (bug 993029)