Restore a bit of accidentally deleted code during the merge conflict fix from master
Restore a bit of accidentally deleted code during the merge conflict fix from master

Zosoled/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus