Revert "Proper scrollbar width accounting"