Revert "Merge pull request #4533 from SalesforceFoundation/feature/psadie/bdi-custom-label-update"
Revert "Merge pull request #4533 from SalesforceFoundation/feature/psadie/bdi-custom-label-update"

This reverts commit 5b6424bdd54247f7d2ae276a97b8bfe0c9368271, reversing
changes made to c2b041a289496d558422e502ad660d29525ec26b.

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