R1:87ebb80059f0

Revert "Clean up more Quicksand"

Summary: This reverts commit 5eb4bc6ca960aa0eafaa25591baea102ff4e034b.

Test Plan: Reload homepage, no scrollbars

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16645