This reverts commit 005dc8f68b9d09f2a4db46bdbfae3e05d3604818. The PR accidently introduced a breaking change https://github.com/angular/angular/pull/23668#discussion_r186265055
This reverts commit 005dc8f68b9d09f2a4db46bdbfae3e05d3604818. The PR accidently introduced a breaking change https://github.com/angular/angular/pull/23668#discussion_r186265055