diff --git a/setup/bindir/cloud-set-guest-password.in b/setup/bindir/cloud-set-guest-password.in
index be3a0effab6..a3f80d2ec0c 100755
--- a/setup/bindir/cloud-set-guest-password.in
+++ b/setup/bindir/cloud-set-guest-password.in
@@ -31,7 +31,7 @@ do
 			if [ $? -eq 0 ]
 			then
 				logger -t "cloud" "Got response from server at $PASSWORD_SERVER_IP"
-				password=$(echo $password | tr -d '\r')
+
 				case $password in
 				
 				"")					logger -t "cloud" "Password server at $PASSWORD_SERVER_IP did not have any password for the VM"