diff --git a/lnwallet/channel.go b/lnwallet/channel.go
index d1cff032..c0d6dd07 100644
--- a/lnwallet/channel.go
+++ b/lnwallet/channel.go
@@ -705,7 +705,7 @@ func createNewCommitmentTxns(fundingTxIn *wire.TxIn, state *channeldb.OpenChanne
 // relative block delay or revocation event, and the other paying the the
 // counter-party within the channel, which can be spent immediately.
 func createCommitTx(fundingOutput *wire.TxIn, selfKey, theirKey *btcec.PublicKey,
-	revokeHash []byte, csvTimeout uint32, amountToSelf,
+	revokeKey *btcec.PublicKey, csvTimeout uint32, amountToSelf,
 	amountToThem btcutil.Amount) (*wire.MsgTx, error) {
 
 	// First, we create the script for the delayed "pay-to-self" output.
@@ -713,7 +713,6 @@ func createCommitTx(fundingOutput *wire.TxIn, selfKey, theirKey *btcec.PublicKey
 	// output after a relative block delay, or the remote node can claim
 	// the funds with the revocation key if we broadcast a revoked
 	// commitment transaction.
-	revokeKey := deriveRevocationPubkey(theirKey, revokeHash)
 	ourRedeemScript, err := commitScriptToSelf(csvTimeout, selfKey,
 		revokeKey)
 	if err != nil {
diff --git a/lnwallet/script_utils_test.go b/lnwallet/script_utils_test.go
index 8580901f..c750e9a9 100644
--- a/lnwallet/script_utils_test.go
+++ b/lnwallet/script_utils_test.go
@@ -40,7 +40,8 @@ func TestCommitmentSpendValidation(t *testing.T) {
 		bobsPrivKey)
 	channelBalance := btcutil.Amount(1 * 10e8)
 	csvTimeout := uint32(5)
-	revocationHash := testHdSeed[:]
+	revocationPreimage := testHdSeed[:]
+	revokePubKey := deriveRevocationPubkey(bobKeyPub, revocationPreimage)
 
 	// With all the test data set up, we create the commitment transaction.
 	// We only focus on a single party's transactions, as the scripts are
@@ -50,7 +51,7 @@ func TestCommitmentSpendValidation(t *testing.T) {
 	// of 5 blocks before sweeping the output, while bob can spend
 	// immediately with either the revocation key, or his regular key.
 	commitmentTx, err := createCommitTx(fakeFundingTxIn, aliceKeyPub,
-		bobKeyPub, revocationHash, csvTimeout, channelBalance, channelBalance)
+		bobKeyPub, revokePubKey, csvTimeout, channelBalance, channelBalance)
 	if err != nil {
 		t.Fatalf("unable to create commitment transaction: %v", nil)
 	}
@@ -72,7 +73,6 @@ func TestCommitmentSpendValidation(t *testing.T) {
 	})
 
 	// First, we'll test spending with Alice's key after the timeout.
-	revokePubKey := deriveRevocationPubkey(bobKeyPub, revocationHash)
 	delayScript, err := commitScriptToSelf(csvTimeout, aliceKeyPub, revokePubKey)
 	if err != nil {
 		t.Fatalf("unable to generate alice delay script: %v")
@@ -82,7 +82,6 @@ func TestCommitmentSpendValidation(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unable to generate delay commit spend witness :%v")
 	}
-
 	sweepTx.TxIn[0].Witness = aliceWitnessSpend
 	vm, err := txscript.NewEngine(delayOutput.PkScript,
 		sweepTx, 0, txscript.StandardVerifyFlags, nil,
@@ -97,13 +96,12 @@ func TestCommitmentSpendValidation(t *testing.T) {
 	// Next, we'll test bob spending with the derived revocation key to
 	// simulate the scenario when alice broadcasts this commitmen
 	// transaction after it's been revoked.
-	revokePrivKey := deriveRevocationPrivKey(bobKeyPriv, revocationHash)
+	revokePrivKey := deriveRevocationPrivKey(bobKeyPriv, revocationPreimage)
 	bobWitnessSpend, err := commitSpendRevoke(delayScript, channelBalance,
 		revokePrivKey, sweepTx)
 	if err != nil {
 		t.Fatalf("unable to generate revocation witness: %v", err)
 	}
-
 	sweepTx.TxIn[0].Witness = bobWitnessSpend
 	vm, err = txscript.NewEngine(delayOutput.PkScript,
 		sweepTx, 0, txscript.StandardVerifyFlags, nil,
@@ -126,7 +124,6 @@ func TestCommitmentSpendValidation(t *testing.T) {
 	if err != nil {
 		t.Fatalf("unable to create bob regular spend: %v", err)
 	}
-
 	sweepTx.TxIn[0].Witness = bobRegularSpend
 	vm, err = txscript.NewEngine(regularOutput.PkScript,
 		sweepTx, 0, txscript.StandardVerifyFlags, nil,