CLOSED TREE Backed out changeset 7fe3d7c91ecd (bug 1222323) Backed out changeset 2b006f565385 (bug 1222323)