Revert "Revert "Revert "stage 1"""

This reverts commit 01f84ae4056beddefd6acf74a0d23dce59188f4d.