Revert "More scrolling behavior changes"

This reverts commit 306c83346a8d1e7f1ddf45eaaf39491410257ad0.
I will get this scrolling logic down one of these days…