It's odd that JF still had code lying around for generating a self signed cert. Currently, it does not do this so this code has been removed.
JF also appears to have functions in place to modify provided certs? Warrants deeper investigation. JF should not be attempting modifications of any certs under any circumstance.