394be8a (#2855) and 2b3b310 (#3183) introduced side effects (scroll mode crashing and TOC being reset and rebuild). This reverts parts of them not yet reverted.
394be8a
2b3b310