Revert "Fix for instance-based views"

This reverts commit eec3c8276fe1126311b2edc98df194ab6ea26e73.
Fix for instance based views (attempt #2)