diff --git a/env/common.c b/env/common.c
index 5a17e52615..2e94dd71e2 100644
--- a/env/common.c
+++ b/env/common.c
@@ -41,17 +41,12 @@ static uchar env_get_char_init(int index)
 		return default_environment[index];
 }
 
-static const uchar *env_get_addr(int index)
-{
-	if (gd->env_valid)
-		return (uchar *)(gd->env_addr + index);
-	else
-		return &default_environment[index];
-}
-
 static uchar env_get_char_memory(int index)
 {
-	return *env_get_addr(index);
+	if (gd->env_valid)
+		return *(uchar *)(gd->env_addr + index);
+	else
+		return default_environment[index];
 }
 
 uchar env_get_char(int index)