Revert "Revert: Re-apply pull request #202 to be apart of BLC 3.0.2 (f5cbae6)"

This reverts commit 075347e78f84a3e8a4b935c7592aba3caddd2ee5.