changes for #5219 accidentally reverted unrelated changes made by other commits. Restore those & remove some dead code that was commented out.
changes for #5219 accidentally reverted unrelated changes made by other commits. Restore those & remove some dead code that was commented out.

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