Revert r169456, "change MCContext to work on the doInitialization/doFinalization...