Merge pull request #9305: Revert "[BEAM-7916] Add ElasticsearchIO query parameter to take a ValueProvider"