this is a potentially breaking change for UI logic.  I think it is OK, but we should discuss.