Re #7778. Revert changes to FilterEvents.

It turns out that FilterEvents is relying on workspaces being in the ADS
before the algorithm has completed so that it can call GroupWorkspaces on
them. Probably the proper solution would be to refactor so that they are
placed directly into  a group, but I'm not going there now.
Merge branch 'bugfix/7778_unnecessary_ads_usage' into develop