That wasn't the previous behavior. I'm not sure it would hurt, but maybe should be a separate refactor?