Fix bad merge (recent cert chaining changeset).