Please don't force commit! Re-apply fix from commit [20700] that got reverted in [20706]
Please don't force commit!
Re-apply fix from commit [20700] that got reverted in [20706]

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