Revert 30fbee5..e6617a4

This rolls back to commit 30fbee58fbfc2930ae7dfc77109a73cef17ff825.
Revert e6617a4..8f35d1c

This rolls back to commit e6617a412743b158885fea01165055f8130a9042.
Revert "remove the view"

This reverts commit 30fbee58fbfc2930ae7dfc77109a73cef17ff825.