Merge pull request #3653 from bjjay/bjjay-patch

Reduce once MB_ENABLED checking