diff --git a/daemon/peer.c b/daemon/peer.c
index c3696b797..ba1dd1d04 100644
--- a/daemon/peer.c
+++ b/daemon/peer.c
@@ -1898,15 +1898,6 @@ static void retransmit_updates(struct peer *peer)
 		}
 	}
 
-	/* This feechange may not be appropriate any more, but that's no
-	 * different from when we sent it last time.  And this avoids us
-	 * creating different commit txids on retransmission */
-	if (peer->feechanges[SENT_FEECHANGE_COMMIT]) {
-		u64 feerate = peer->feechanges[SENT_FEECHANGE_COMMIT]->fee_rate;
-		log_debug(peer->log,
-			  "Retransmitting feechange %"PRIu64, feerate);
-		queue_pkt_feechange(peer, feerate);
-	}
 	assert(!peer->feechanges[SENT_FEECHANGE]);
 }
 
@@ -2086,8 +2077,8 @@ static bool want_feechange(const struct peer *peer)
 	log_debug(peer->log, "Current fee_rate: %"PRIu64" want %"PRIu64,
 		  peer->local.staging_cstate->fee_rate,
 		  desired_commit_feerate(peer->dstate));
-	return peer->local.staging_cstate->fee_rate
-		!= desired_commit_feerate(peer->dstate);
+	/* FIXME: Send fee changes when we want it */
+	return false;
 }
 
 static void peer_has_connected(struct peer *peer)
@@ -2262,41 +2253,6 @@ static void peer_disconnect(struct io_conn *conn, struct peer *peer)
 	}
 }
 
-static void maybe_propose_new_feerate(struct peer *peer)
-{
-	u64 rate, max_rate;
-
-	rate = desired_commit_feerate(peer->dstate);
-	max_rate = approx_max_feerate(peer->remote.staging_cstate, LOCAL);
-	assert(can_afford_feerate(peer->remote.staging_cstate, max_rate, LOCAL));
-
-	/* BOLT #2:
-	 *
-	 * The sending node MUST NOT send a `fee_rate` which it could not
-	 * afford (see "Fee Calculation), were it applied to the receiving
-	 * node's commitment transaction.  */
-	if (rate > max_rate) {
-		log_debug(peer->log,
-			  "Cannot afford feerate %"PRIi64" using %"PRIi64,
-			  rate, max_rate);
-		rate = max_rate;
-
-		/* If this is less than we have no, don't change! */
-		if (rate < peer->local.staging_cstate->fee_rate) {
-			log_debug(peer->log, "Leaving old rate in place");
-			return;
-		}
-	}
-
-	/* No fee rate change?  Fine. */
-	if (peer->local.staging_cstate->fee_rate == rate)
-		return;
-
-	set_feechange(peer, rate, SENT_FEECHANGE);
-	queue_pkt_feechange(peer, rate);
-	peer->local.staging_cstate->fee_rate = rate;
-}
-
 static void do_commit(struct peer *peer, struct command *jsoncmd)
 {
 	struct commit_info *ci;
@@ -2313,9 +2269,6 @@ static void do_commit(struct peer *peer, struct command *jsoncmd)
 	};
 	bool to_us_only;
 
-	/* If we want to change the payrate, do it now. */
-	maybe_propose_new_feerate(peer);
-
 	/* We can have changes we suggested, or changes they suggested. */
 	if (!peer_uncommitted_changes(peer)) {
 		log_debug(peer->log, "do_commit: no changes to commit");
diff --git a/daemon/test/test.sh b/daemon/test/test.sh
index c393da7b8..66fdd323e 100755
--- a/daemon/test/test.sh
+++ b/daemon/test/test.sh
@@ -559,22 +559,23 @@ if [ -n "$DIFFERENT_FEES" ]; then
     check_status_single lcli1 $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) "" $(($HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) ""
     check_status_single lcli2 $(($HTLC_AMOUNT - $NO_HTLCS_FEE2 / 2)) $(($NO_HTLCS_FEE2 / 2)) "" $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE2 / 2)) $(($NO_HTLCS_FEE2 / 2)) ""
 
-    # Change fee rate on node2 to same as node1.
-    lcli2 dev-feerate 40000
-    $CLI generate 1
-    [ ! -n "$MANUALCOMMIT" ] || lcli2 dev-commit $ID1
-    [ ! -n "$MANUALCOMMIT" ] || lcli1 dev-commit $ID2
+    # FIXME: reactivate feechanges!
+    # # Change fee rate on node2 to same as node1.
+    # lcli2 dev-feerate 40000
+    # $CLI generate 1
+    # [ ! -n "$MANUALCOMMIT" ] || lcli2 dev-commit $ID1
+    # [ ! -n "$MANUALCOMMIT" ] || lcli1 dev-commit $ID2
 
-    check_status $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) "" $(($HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) "" 
+    # check_status $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) "" $(($HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) "" 
 
-    # Change back.
-    lcli2 dev-feerate 50000
-    $CLI generate 1
-    [ ! -n "$MANUALCOMMIT" ] || lcli2 dev-commit $ID1
-    [ ! -n "$MANUALCOMMIT" ] || lcli1 dev-commit $ID2
+    # # Change back.
+    # lcli2 dev-feerate 50000
+    # $CLI generate 1
+    # [ ! -n "$MANUALCOMMIT" ] || lcli2 dev-commit $ID1
+    # [ ! -n "$MANUALCOMMIT" ] || lcli1 dev-commit $ID2
 
-    check_status_single lcli1 $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) "" $(($HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) ""
-    check_status_single lcli2 $(($HTLC_AMOUNT - $NO_HTLCS_FEE2 / 2)) $(($NO_HTLCS_FEE2 / 2)) "" $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE2 / 2)) $(($NO_HTLCS_FEE2 / 2)) ""
+    # check_status_single lcli1 $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) "" $(($HTLC_AMOUNT - $NO_HTLCS_FEE / 2)) $(($NO_HTLCS_FEE / 2)) ""
+    # check_status_single lcli2 $(($HTLC_AMOUNT - $NO_HTLCS_FEE2 / 2)) $(($NO_HTLCS_FEE2 / 2)) "" $(($AMOUNT - $HTLC_AMOUNT - $NO_HTLCS_FEE2 / 2)) $(($NO_HTLCS_FEE2 / 2)) ""
 
     lcli1 close $ID2
     # Make sure they notice it.