Backed out changeset db836ecd7746 (bug 943613) for build bustage
Backed out changeset 076bf878c59a (bug 942432) for build bustage