Revert "Phase-2"

This reverts commit a85204eb486f6557ba4599473fa584eb61dd6b73.