Revert 2 last hunks of last commit since it's not related with the fix
Revert 2 last hunks of last commit since it's not related with the fix

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