Issue #1018850: Followup to update Views integrations in Views 2