Revert "Merge my SSL changes in from prod box"

This reverts commit e4198ecf2d4962748ebd157aa304eb75a70e7a11.