Merge pull request #1585 from reaperhulk/revert-1512

Revert "Fixed #1494 -- switch which define we look for for SSLv3 disable...