Revert "Starting from scratch"

This reverts commit b1a9d0bd4ce207662228ce5dbecceb520337b8d3.