Revert "Pass context as nil"

This reverts commit 40067942c2f14fed15f065e442ada0bc372af764.