Revert "convenience views for upgrading"

This reverts commit ee0dc646b09033da6c94e262719e1607732fe3b2.