Backed out changeset bf25101e66cf (bug 1095098) for build bustage