Revert "Merge branch 'context'"

This reverts commit 1bd8180a9495b22caf54a9c5c3d883a165135e0b, reversing
changes made to 9bb32331f41442dba1a7059890308b5fb9af113a.