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