Revert "Fixes scroll view and bad commit"

This reverts commit d5977b844c5421ed9b91011daaa292342507ec61.