Put back in a hack that makes sure the datastore is saved on exit that was thought to not be necessary anymore with the last update.