diff --git a/pengine/test10/use-after-free-merge.xml b/pengine/test10/use-after-free-merge.xml
index cb914a098e..e51478a7ff 100644
--- a/pengine/test10/use-after-free-merge.xml
+++ b/pengine/test10/use-after-free-merge.xml
@@ -1,73 +1,72 @@
 <cib validate-with="pacemaker-1.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="2464" num_updates="17" cib-last-written="Fri Jul 13 13:51:22 2012" dc-uuid="hex-13">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.1-536bf0b9d3ba6d412c67b27f89682ae9380b28ff"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="openais"/>
         <nvpair id="cib-bootstrap-options-expected-quorum-votes" name="expected-quorum-votes" value="2"/>
         <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
         <nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1271327761"/>
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="hex-13" type="normal" uname="hex-13">
         <instance_attributes id="nodes-hex-13">
           <nvpair id="nodes-hex-13-standby" name="standby" value="off"/>
         </instance_attributes>
       </node>
       <node id="hex-14" type="normal" uname="hex-14">
         <instance_attributes id="nodes-hex-14">
           <nvpair id="nodes-hex-14-standby" name="standby" value="off"/>
         </instance_attributes>
       </node>
     </nodes>
     <resources>
       <primitive class="stonith" id="fencing-sbd" type="external/sbd">
         <instance_attributes id="fencing-sbd-instance_attributes">
           <nvpair id="fencing-sbd-instance_attributes-sbd_device" name="sbd_device" value="/dev/disk/by-id/dm-uuid-part1-mpath-3600508b400105b5a0001500000280000"/>
         </instance_attributes>
         <meta_attributes id="fencing-sbd-meta_attributes">
           <nvpair id="fencing-sbd-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
       </primitive>
       <group id="g0">
         <primitive class="ocf" id="d0" provider="heartbeat" type="Dummy"/>
         <primitive class="ocf" id="d1" provider="heartbeat" type="Dummy"/>
         <meta_attributes id="g0-meta_attributes">
           <nvpair id="g0-meta_attributes-target-role" name="target-role" value="Stopped"/>
         </meta_attributes>
       </group>
       <master id="ms0">
         <primitive class="ocf" id="s0" provider="heartbeat" type="Stateful"/>
         <meta_attributes id="ms0-meta_attributes">
           <nvpair id="ms0-meta_attributes-target-role" name="target-role" value="Started"/>
         </meta_attributes>
       </master>
     </resources>
     <constraints>
       <rsc_location id="cli-standby-fencing-sbd" rsc="fencing-sbd">
         <rule id="cli-standby-rule-fencing-sbd" score="-INFINITY">
           <expression attribute="#uname" id="cli-standby-expr-fencing-sbd" operation="eq" value="hex-13"/>
         </rule>
       </rsc_location>
       <rsc_order first="g0" id="promote-after-g0" score="INFINITY" then="ms0" then-action="promote"/>
-      <!--rsc_colocation id="master-with-g0" rsc="ms0" rsc-role="Master" score-attribute="info" with-rsc="g0"/-->
-      <rsc_colocation id="master-with-g0" rsc="ms0" rsc-role="Master" score-attribute="info" with-rsc="g0"/>
+      <rsc_colocation id="master-with-g0" rsc="ms0" rsc-role="Master" score="INFINITY" with-rsc="g0"/>
     </constraints>
     <rsc_defaults/>
     <op_defaults/>
   </configuration>
   <status>
     <node_state id="hex-13" uname="hex-13" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_state_transition" shutdown="0">
       <lrm id="hex-13">
         <lrm_resources/>
       </lrm>
     </node_state>
     <node_state id="hex-14" uname="hex-14" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_state_transition" shutdown="0">
       <lrm id="hex-14">
         <lrm_resources/>
       </lrm>
     </node_state>
   </status>
 </cib>
\ No newline at end of file