Undid Overscroll Fix

The overscroll fix created some other (worse) problems.