Fixed all the messed up stuff.

Back to pre-Angular state.