Re-added AIPs model to work around issue.