Revert "Accomodate for first save..."

This reverts commit 8f33bbde75d79be5ee045433030d4a3724dcefc6.