[Remove Mbox3 UCM] Request to revert pull 237