fully back out previous change and fix cvssync
fully back out previous change and fix cvssync

NOYB/pfsense,NewEraCracker/pfsense,ptorsten/pfsense,ch1c4um/pfsense,BlackstarGroup/pfsense,NewEraCracker/pfsense,dennypage/pfsense,pfsense/pfsense,BlackstarGroup/pfsense,pfsense/pfsense,dennypage/pfsense,brunostein/pfsense,pfsense/pfsense,jxmx/pfsense,dennypage/pfsense,phil-davis/pfsense,BlackstarGroup/pfsense,ch1c4um/pfsense,phil-davis/pfsense,phil-davis/pfsense,NewEraCracker/pfsense,brunostein/pfsense,phil-davis/pfsense,BlackstarGroup/pfsense,jxmx/pfsense,dennypage/pfsense,brunostein/pfsense,ptorsten/pfsense,pfsense/pfsense,NOYB/pfsense,ch1c4um/pfsense,ch1c4um/pfsense,NewEraCracker/pfsense,NOYB/pfsense,ptorsten/pfsense,jxmx/pfsense