Revert "Merge branch 'scrolling' into fix"

This reverts commit 60f369643f4f822a394d1b38464101a5aa181eff, reversing
changes made to 8bf84e9593ecbc18c63a8a3d036ff41a1f143414.
Fixed the mentions issue