Revert "Revert "no more content access, breaks unpublished views""

This reverts commit 72d2d79203245ab761640221c52cc91b53c37036.