Roll back !66 base structure changes

Now, when any filter or provider fails - only the error handler will be
called