diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 142a012019248785456f7244fec9e1ff757b7636..b721cd46dc9db26b31c0645ec502a7801644dfa2 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -8097,7 +8097,8 @@ class LUExportInstance(LogicalUnit):
       "EXPORT_NODE": self.op.target_node,
       "EXPORT_DO_SHUTDOWN": self.op.shutdown,
       "SHUTDOWN_TIMEOUT": self.shutdown_timeout,
-      "REMOVE_INSTANCE": int(self.remove_instance),
+      # TODO: Generic function for boolean env variables
+      "REMOVE_INSTANCE": str(bool(self.remove_instance)),
       }
     env.update(_BuildInstanceHookEnvByObject(self, self.instance))
     nl = [self.cfg.GetMasterNode(), self.instance.primary_node,