Revert "Merge branch 'master-maszyman-ateam-882' into 'master'"

This reverts merge request !60269 (merged) as there were some issues dealing with the case of maxEvents=-1, while @maszyman and @gemmeren work on an alternative fix.

Tagging @amete, @nstyles, @jcatmore, @tsulaia