Re-added fields, removed AngularJS includes.