diff --git a/senlin/common/config.py b/senlin/common/config.py
index 6a8502bcb..25157d4dc 100644
--- a/senlin/common/config.py
+++ b/senlin/common/config.py
@@ -86,11 +86,6 @@ engine_opts = [
                 default=False,
                 help=_('Flag to indicate whether to enforce unique names for '
                        'Senlin objects belonging to the same project.')),
-    cfg.BoolOpt('rpc_use_object',
-                default=True,
-                help=_("!!!Temporary!!! This is a temporary flag indicating "
-                       "whether senlin RPC will use the versionedobjects "
-                       "based parameter passing")),
 ]
 cfg.CONF.register_opts(engine_opts)
 
diff --git a/senlin/engine/service.py b/senlin/engine/service.py
index 045f9f0b4..bf6f65c0c 100644
--- a/senlin/engine/service.py
+++ b/senlin/engine/service.py
@@ -123,10 +123,7 @@ class EngineService(service.Service):
         target = oslo_messaging.Target(version=consts.RPC_API_VERSION,
                                        server=self.host,
                                        topic=self.topic)
-        if CONF.rpc_use_object:
-            serializer = obj_base.VersionedObjectSerializer()
-        else:
-            serializer = None
+        serializer = obj_base.VersionedObjectSerializer()
         self._rpc_server = rpc_messaging.get_rpc_server(
             target, self, serializer=serializer)
         self._rpc_server.start()
diff --git a/senlin/rpc/client.py b/senlin/rpc/client.py
index b4ff030a3..042379dbd 100644
--- a/senlin/rpc/client.py
+++ b/senlin/rpc/client.py
@@ -31,10 +31,7 @@ class EngineClient(object):
     """
 
     def __init__(self):
-        if cfg.CONF.rpc_use_object:
-            serializer = object_base.VersionedObjectSerializer()
-        else:
-            serializer = None
+        serializer = object_base.VersionedObjectSerializer()
         self._client = messaging.get_rpc_client(consts.ENGINE_TOPIC,
                                                 cfg.CONF.host,
                                                 serializer=serializer)
diff --git a/senlin/tests/unit/engine/test_engine_startstop.py b/senlin/tests/unit/engine/test_engine_startstop.py
index 5956491fd..633a0d2d1 100644
--- a/senlin/tests/unit/engine/test_engine_startstop.py
+++ b/senlin/tests/unit/engine/test_engine_startstop.py
@@ -75,12 +75,8 @@ class EngineBasicTest(base.SenlinTestCase):
                                              server=self.eng.host,
                                              topic=self.eng.topic)
 
-        if cfg.CONF.rpc_use_object:
-            self.get_rpc.assert_called_once_with(mock_target, self.eng,
-                                                 serializer=mock.ANY)
-        else:
-            self.get_rpc.assert_called_once_with(mock_target, self.eng,
-                                                 serializer=None)
+        self.get_rpc.assert_called_once_with(mock_target, self.eng,
+                                             serializer=mock.ANY)
 
         self.assertEqual(self.fake_rpc_server, self.eng._rpc_server)
         self.fake_rpc_server.start.assert_called_once_with()