Phase 2
Revert "Phase 2"

This reverts commit 9f7839d99341db84581600a9686eace22a2add36.