That would take a lot of work to redo all the specs - if we really want to make this change (I don't), let's put this in another sprint.