Issue #1222736 Fix export errors caused when previous export fix of using export plugins got broken by changes in Views.
