Starting it over

This reverts commit d929c4c938ecd7a1b335cfed83250b4f915e7253.