we probably could drop the whole pre-schema-upgrade behavior.