Revert "Starting from scratch"

This reverts commit 5d95336c8977b72454c26fbf8ce4d6ea47eb9238.
xRevert "Starting from scratch"

This reverts commit 42b1e5e84b95d54af14b6a038ede85a94b8cb66c.