Revert "FLEX-33879 fix scrolling issue"

This reverts commit 6a07ef67dce6edca9f7ec72a4b4eb109e345bb1a.
keeping release notes in sync, hopefully the two issues marked [REVERTED] can be fixed