Revert "Fix infra merge jjb job."