This reverts commit 09e0b0ac6ffa39844303b61eba2dae4cbb11debe. Closes #3764
Remove once https://github.com/angular/angular/issues/3757 is resolved