Back out angular changes which should have gone onto ng branch