Revert changes done for the scrollbars in a5f346a1