Revert "Merge pull request #1179 from Wikia/DAR-1355"; it caused another issue with horizontal scroll bar

This reverts commit 84800987e6079d1fd27072efa9fb0aa5e99278f0, reversing
changes made to d10f585efe5d7228e5bda0c98ce1547dbf6225d4.