Revert "Update Master To Phase 2"

This reverts commit 65c28b1bd6e69d9db03f03a79fa7fd10f852be8a.