Merge "Revert "Pass the builder type to verify jobs""