I really do think this workflow is better overall, but it makes bug squashing tedious