diff --git a/bitcoin/block.c b/bitcoin/block.c
index 292881adc..059d0a584 100644
--- a/bitcoin/block.c
+++ b/bitcoin/block.c
@@ -91,27 +91,7 @@ bitcoin_block_from_hex(const tal_t *ctx, const struct chainparams *chainparams,
 void bitcoin_block_blkid(const struct bitcoin_block *b,
 			 struct bitcoin_blkid *out)
 {
-	struct sha256_ctx shactx;
-
-	sha256_init(&shactx);
-	sha256_le32(&shactx, b->hdr.version);
-	sha256_update(&shactx, &b->hdr.prev_hash, sizeof(b->hdr.prev_hash));
-	sha256_update(&shactx, &b->hdr.merkle_hash, sizeof(b->hdr.merkle_hash));
-	sha256_le32(&shactx, b->hdr.timestamp);
-
-        if (is_elements(chainparams)) {
-		size_t clen = tal_bytelen(b->elements_hdr->proof.challenge);
-		sha256_le32(&shactx, b->elements_hdr->block_height);
-
-		sha256_varint(&shactx, clen);
-		sha256_update(&shactx, b->elements_hdr->proof.challenge, clen);
-		/* The solution is skipped, since that'd create a circular
-		 * dependency apparently */
-	} else {
-		sha256_le32(&shactx, b->hdr.target);
-		sha256_le32(&shactx, b->hdr.nonce);
-	}
-	sha256_double_done(&shactx, &out->shad);
+	*out = b->hdr.hash;
 }
 
 /* We do the same hex-reversing crud as txids. */