Maybe we are, maybe we aren't.  But I'd like to ditch it in one hit, then if we decide that was a bad idea, we have one commit to roll back, rather than having to go back through and undo all the tiny incremental breakages.