Fix the scrolling issues, take 3

This also reverts 6f0e9379e0ad18bd619f3fad899c2d2dbe51f41f "Properly fix the
scrolling issues".