Revert "Abstration of context"

This reverts commit 418459bb7daef844a802fd3aec147f73aa4dbc07.