Merge pull request #2296 from reaperhulk/correct-my-review-mistake

add conditional removal for SET_CERT_CB