This reverts commit 9148359510e1de88e99bdf7e1f0d6bdd250222a3. Revert commit since it also scroll horizontaly