Revert "Phase 6"

This reverts commit 682fd455f528cf59dad50195f0c352ff6fb82cd1.