Revert "Experimenting with the viewport"

This reverts commit b702ea4fbe2c94f8e5013102b5816fbdbf704aca.