Backed out changeset 32786d29daf8 (bug 830099) because of build bustage
Backed out changeset 19b9f064d8eb (bug 795896) because of build bustage