Revert "Problems with scrolling"

This reverts commit 999bdeebf5a8f7bac51ad05324d4d1997d9b85d7.