I would say a mix of both, but more the problem is with the way the software fights your desire for custom workflow rather than encourage it or make it cheap.

Think Git/Hg vs CVS when it comes to branching.