Backed out 2 changesets (bug 1050802) for bustage, CLOSED TREE

Backed out changeset c365e93b8e42 (bug 1050802)
Backed out changeset 7e35629e7cdb (bug 1050802)