Backed out changeset 43b24197d25a (bug 1047667) to cleanly backout 1047181
Backed out changeset 5710731f09e9 (bug 1047181) for bc1 orange