CLOSED TREE Backed out changeset 15b6ae49e509 (bug 1715300) Backed out changeset 6dc09e2d617c (bug 1715300)