Fix #971: Allow saving/restoring of session setups