- re-enable return_fields specification