diff --git a/core/peer/peer.go b/core/peer/peer.go
index e19a71e64d2..c9e77513540 100644
--- a/core/peer/peer.go
+++ b/core/peer/peer.go
@@ -234,17 +234,13 @@ func CreateChainFromBlock(cb *common.Block) error {
 	if err != nil {
 		return err
 	}
-	var ledger ledger.PeerLedger
-	if ledger, err = createLedger(cid); err != nil {
-		return err
-	}
 
-	if err := ledger.Commit(cb); err != nil {
-		peerLogger.Errorf("Unable to get genesis block committed into the ledger, chainID %v", cid)
-		return err
+	var l ledger.PeerLedger
+	if l, err = ledgermgmt.CreateWithGenesisBlock(cb); err != nil {
+		return fmt.Errorf("Cannot create ledger from genesis block, due to %s", err)
 	}
 
-	return createChain(cid, ledger, cb)
+	return createChain(cid, l, cb)
 }
 
 // MockCreateChain used for creating a ledger for a chain for tests