Revert "2nd phase"

This reverts commit 094ccdc2a64b9282067a7e9a59e4a6be599d5936.