Revert "Added Collin's viewport improvement"

This reverts commit 2f1baeb49c82cf7d1fed14d364f8ed54e42b1dcb.