Revert "Merge branch '847-combine-polling-queries-to-one-polling-query' into 'release-3.0'"

This reverts merge request !1229 (merged)