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