diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fddb25fa39f..f9e205aa32a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-27  Richard Guenther  <rguenth@gcc.gnu.org>
+
+	* tree-ssa-propagate.c (set_rhs): Revert last change.
+
 2005-04-27  Steve Ellcey  <sje@cup.hp.com>
 
 	* explow.c (convert_memory_address): Add gcc_assert.
diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index 35b845b0715..69f41bab91d 100644
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -571,8 +571,7 @@ set_rhs (tree *stmt_p, tree expr)
 	  || !is_gimple_val (TREE_OPERAND (expr, 1)))
 	return false;
     }
-  else if (TREE_CODE_CLASS (code) == tcc_unary
-	   || code == ADDR_EXPR)
+  else if (TREE_CODE_CLASS (code) == tcc_unary)
     {
       if (!is_gimple_val (TREE_OPERAND (expr, 0)))
 	return false;