Revert "Revert "Revert "Revert "stage 1""""

This reverts commit 100834bf568836f69cc7d9b9923e83f8126fa735.