Revert "Accomodate for first save... Take II"

This reverts commit 91a156fede2e59ba80935c39c13544d2138ab16c.