Backed out changeset 7acdb79e4d71 (bug 876639)
Backed out changeset 82024a9a3dfd (bug 876639) for B2G compilation failures on a CLOSED TREE