Try doing universal builds as separate commands

Try doing universal builds as separate commands #2598