Revert "Update to mainline angular branch"

This reverts commit 70ec85c6c2ac3cfe4e5d49444beeb406335b411a.