Revert "Starting from scratch!"

This reverts commit 57ddfc39d218a16fa44b89f3354eeae0973733a6.