Revert mbox importer changes for ribbon branch