Restore Context after mocking it for tests (fixes CI); fix dep

Testing Done:
./build-support/bin/ci.sh

Reviewed at https://rbcommons.com/s/twitter/r/731/