DDF-489: Moved functionality into main delegating filter.