[revert] restore x/upgrade

I removed x/upgrade from the app since we do not use int (!3593 (merged)). But there is some desire to keep it around in case we change our mind. This restores it to the app.