MULE-6872 revert changes for HA support improvement