Preparing for further changes.
Issue #2353079 by DamienMcKenna: Fixed Views integration, for real this time.