Ignore OCSP (Firefox 32+)

Currently we have two solutions to this; now let's merge them...
Merge the two OCSP-avoidance approaches

One for FF 32+, one for <32
Remove dangling call to old code
Fix plumbing