Backed out 1 changesets (bug 1050546) for build bustage

Backed out changeset c7a9e8177202 (bug 1050546)