Reverting GH-216 due to scrolling issues it causes (GH-229)

Will need to find a different way to make the change from 216.