Bring back scroll saving functionality

Bring back functionality added by #1