Revert "Merge pull request #1363 from Treora/fix_view_contexts"

This reverts commit 32b616348a5c1e25a661a6fdd786f29d674c2386, reversing
changes made to 06100252644f8c73dfac14e8a30a0c8718df3fe4.