Revert "Bug 828890 - [Settings] Scroll bar should not go over the header"

This reverts commit ddb97553953d46714e0dbf9cbbaecaa4018d2152.