Backed out 2 changesets (bug 964200) for build bustage
CLOSED TREE

Backed out changeset 7dbe53176a38 (bug 964200)
Backed out changeset 19993e76f4a0 (bug 964200)