Revert "Starting over..."

This reverts commit 9733c56bacd534b318cd39aa6c1f6b3c26578d4e.
Revert "Revert "Starting over...""

This reverts commit a5f0d4028c5d7d39c394273cb1021d8e0ecac3a6.