Revert "Properly finish MBC"

This reverts commit cac04908500b0b23fc1a15c4b7964f5be16fa804.