diff --git a/real_system_state.h b/real_system_state.h
index 32d972b..aac7efc 100644
--- a/real_system_state.h
+++ b/real_system_state.h
@@ -90,7 +90,7 @@
 
   virtual inline chromeos_policy_manager::PolicyManager* policy_manager()
       override {
-    return &policy_manager_;
+    return policy_manager_.get();
   }
 
   virtual inline bool system_rebooted() override {
@@ -142,7 +142,7 @@
 
   scoped_ptr<P2PManager> p2p_manager_;
 
-  chromeos_policy_manager::PolicyManager policy_manager_;
+  scoped_ptr<chromeos_policy_manager::PolicyManager> policy_manager_;
 
   policy::PolicyProvider policy_provider_;