Revert chronic care diagnosis changes on forms, and re-enable updating these from code