Revert "Phase 2 initial commit."

This reverts commit e6ef35f83869141cfe2e12c0b2572ecf67772aef.