Backed out changeset c848ede03acc (bug 938950) for build bustage