Revert 64cc81f..059aba8

This rolls back to commit 64cc81f386a8f69546cb0b7a6e0ec5a9342a815d.
fixed flow scroll