"hunt down all the dependencies on the inner viewport element and move them to the container element, etc." @Keavon you wanted to restructure/redo #3012 in a cleaner way
