Revert "Stage 2 - main"

This reverts commit bb575d66c2ba208553af9464f80602044dca4244.