Revert "Even more scrolling stuff"

This reverts commit 2cc2573be1de9c04df3058dcc9d276a82fe2b0b6.