This reverts commit 293fa5505b9f3d6ef8c3208f5dc8476243aaadc9. The rebased commit broke CI: https://travis-ci.org/angular/angular/jobs/115388814