Revert "Merge branch 'Angular'"

This reverts commit 14709aaefdf26b1a8ab1a5fe1959adc835c372bd, reversing
changes made to 53d7bff6f4ea5d8d1c649eb54bfc9c332e4a31ee.