diff --git a/docroot/sites/all/modules/contrib/webform/includes/webform.conditionals.inc b/docroot/sites/all/modules/contrib/webform/includes/webform.conditionals.inc
index e587f5a..d130d1a 100644
--- a/docroot/sites/all/modules/contrib/webform/includes/webform.conditionals.inc
+++ b/docroot/sites/all/modules/contrib/webform/includes/webform.conditionals.inc
@@ -194,12 +194,6 @@ function webform_conditionals_form_submit($form, &$form_state) {
       $conditional['rules'][$rid]['source_type'] = 'component';
     }
     $conditionals[$rgid] = $conditional;
-    // Warn if there are multiple conditionals targetting the same component.
-    if (isset($targets[$conditional['target']])) {
-      drupal_set_message(t('More than one conditional hides or shows component "@name". Only the most-recently evaluated conditional will determine whether "@name" is displayed.',
-                           array('@name' => $node->webform['components'][$conditional['target']]['name'])), 'warning', FALSE);
-    }
-    $targets[$conditional['target']] = TRUE;
   }

   $node->webform['conditionals'] = $conditionals;
diff --git a/docroot/sites/all/modules/contrib/webform/js/webform.js b/docroot/sites/all/modules/contrib/webform/js/webform.js
index 2304c6b..4988288 100644
--- a/docroot/sites/all/modules/contrib/webform/js/webform.js
+++ b/docroot/sites/all/modules/contrib/webform/js/webform.js
@@ -121,6 +121,11 @@ Drupal.webform.conditionalCheck = function(e) {
     $.each(settings.sourceMap[triggerElementKey], function(n, rgid) {
       var ruleGroup = settings.ruleGroups[rgid];

+      // Skip field value action.
+      if (ruleGroup['action'] == 'field_value') {
+        return true;
+      }
+
       // Perform the comparison callback and build the results for this group.
       var conditionalResult = true;
       var conditionalResults = [];
diff --git a/docroot/sites/all/modules/contrib/webform/webform.module b/docroot/sites/all/modules/contrib/webform/webform.module
index 0dee6cc..a214b5c 100644
--- a/docroot/sites/all/modules/contrib/webform/webform.module
+++ b/docroot/sites/all/modules/contrib/webform/webform.module
@@ -2611,7 +2611,7 @@ function _webform_client_form_rule_check($node, $component, $page_num, $input_va
   if ($show_component && ($page_num == 0 || $component['page_num'] == $page_num) && isset($target_map[$component['cid']])) {
     module_load_include('inc', 'webform', 'includes/webform.conditionals');
     $operators = webform_conditional_operators();
-    $conditionals = $target_map[$component['cid']];
+    $conditionals = webform_client_form_get_conditionals($node->webform['conditionals'], $component['cid']);
     foreach ($conditionals as $conditional) {
       $conditional_result = TRUE;

@@ -2697,6 +2697,19 @@ function _webform_client_form_rule_check($node, $component, $page_num, $input_va
   return $show_component;
 }

+function webform_client_form_get_conditionals($conditionals, $cid) {
+  $component_conditionals = array();
+
+  foreach ($conditionals as $conditional) {
+    if ($conditional['target'] == $cid && $conditional['action'] != 'field_value') {
+      $component_conditionals[] = $conditional;
+    }
+  }
+
+
+  return $component_conditionals;
+}
+
 /**
  * Add a component to a renderable array. Called recursively for fieldsets.
  *