More work on bug #8071.  Most of the code is in place.  I just need to make everything not work if the CA stuff is disabled.