Follow-up: remove global var 'needScroll'