ported changes made here https://github.com/angular/quickstart/commit/541bdc5f634e1142860c56cace247234edfaf74b