Backed out changeset 010f5faed9cf (bug 956796) for build bustage