don't leak context when not using CF
Merge branch 'browserid' into browserid-sad