This maintains previous behavior, so I'm going to punt for now, since it's out of scope for this ticket.