Revert changes made in 6346

[dshevtsov]

Purpose of this pull request

This pull request reverts the changes made in #6346 and applies them to 2.3.4.

Reversion scenario:

1. Created a master_backup branch before the revert 2.3.4 GraphQL changes from master #6346 was merged
2. Synced 2.3.4-develop with master after the revert 2.3.4 GraphQL changes from master #6346 was merged
3. Created the ds_revert-6346 branch off the 2.3.4-develop
4. Got the list of changed files with

git show ae574fe5608a38f2fad851d43e79cf88a03abece --name-only

5. Reverted the files with

git checkout master_backup -- <list of changed files>

[jeff-matthews]

I defer to @keharper 's approval on this

[keharper]

This looks complete.

[dshevtsov]

running tests

[ghost]

Hi @dshevtsov, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.