Revert "contextify"

This reverts commit 5816bc0fa09220888bdba57a4075c658d97b603b.
proper contextify