Backed out changeset f5ed560d297f (bug 1083285) for build bustage