Backed out 3 changesets (bug 947337) for build test errors

Backed out changeset 6ade48b8b9d7 (bug 947337)
Backed out changeset f3095f92e1c3 (bug 947337)
Backed out changeset 5becc07d9dac (bug 947337)