Revert "ScrollPane fix"

This reverts commit 00adcda905d733132664393e67f0f9e43b3219ad.