diff --git a/src/Element/WebformComputedBase.php b/src/Element/WebformComputedBase.php
index 4141af398..6496e2f84 100644
--- a/src/Element/WebformComputedBase.php
+++ b/src/Element/WebformComputedBase.php
@@ -88,7 +88,7 @@ abstract class WebformComputedBase extends FormElement implements WebformCompute
       $element['#tree'] = TRUE;
 
       // Set #type to item to trigger #states behavior.
-      // @see drupal_process_states;
+      // @see \Drupal\Core\Form\FormHelper::processStates;
       $element['#type'] = 'item';
 
       $value = static::computeValue($element, $webform_submission);
diff --git a/src/Element/WebformElementMultiple.php b/src/Element/WebformElementMultiple.php
index b713981ed..afbdb6ab6 100644
--- a/src/Element/WebformElementMultiple.php
+++ b/src/Element/WebformElementMultiple.php
@@ -101,7 +101,7 @@ class WebformElementMultiple extends FormElement {
     array_unshift($element['#element_validate'], [get_called_class(), 'validateWebformElementMultiple']);
 
     // Set #type to item to apply #states.
-    // @see drupal_process_states
+    // @see \Drupal\Core\Form\FormHelper::processStates
     $element['#type'] = 'item';
 
     return $element;
diff --git a/src/Plugin/WebformElement/DateBase.php b/src/Plugin/WebformElement/DateBase.php
index 85f94b909..16dc75d28 100644
--- a/src/Plugin/WebformElement/DateBase.php
+++ b/src/Plugin/WebformElement/DateBase.php
@@ -50,7 +50,7 @@ abstract class DateBase extends WebformElementBase {
     $element['#theme_wrappers'] = ['form_element'];
 
     // Must manually process #states.
-    // @see drupal_process_states().
+    // @see \Drupal\Core\Form\FormHelper::processStates
     if (!empty($element['#states'])) {
       $element['#attached']['library'][] = 'core/drupal.states';
       $element['#wrapper_attributes']['data-drupal-states'] = Json::encode($element['#states']);
diff --git a/src/Utility/WebformFormHelper.php b/src/Utility/WebformFormHelper.php
index ea2bdefc5..4c73d1efb 100644
--- a/src/Utility/WebformFormHelper.php
+++ b/src/Utility/WebformFormHelper.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\webform\Utility;
 
+use Drupal\Component\Serialization\Json;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Url;
 
@@ -10,6 +11,29 @@ use Drupal\Core\Url;
  */
 class WebformFormHelper {
 
+  /**
+   * Adds JavaScript to change the state of an element based on another element.
+   *
+   * @param array $elements
+   *   A renderable array element having a #states property as described above.
+   * @param string $key
+   *   The element property to add the states attribute to.
+   *
+   * @see \Drupal\Core\Form\FormHelper::processStates
+   */
+  public static function processStates(array &$elements, $key = '#attributes') {
+    if (empty($elements['#states'])) {
+      return;
+    }
+
+    $elements['#attached']['library'][] = 'core/drupal.states';
+    $elements[$key]['data-drupal-states'] = Json::encode($elements['#states']);
+    // Make sure to include target class for this container.
+    if (empty($elements[$key]['class']) || !WebformArrayHelper::inArray(['js-form-item', 'js-form-submit', 'js-form-wrapper'], $elements[$key]['class'])) {
+      $elements[$key]['class'][] = 'js-form-item';
+    }
+  }
+
   /**
    * Build form jQuery UI tabs.
    *
diff --git a/src/WebformSubmissionConditionsValidator.php b/src/WebformSubmissionConditionsValidator.php
index 95f314538..09970759d 100644
--- a/src/WebformSubmissionConditionsValidator.php
+++ b/src/WebformSubmissionConditionsValidator.php
@@ -16,7 +16,7 @@ use Drupal\webform\Utility\WebformElementHelper;
  * Webform submission conditions (#states) validator.
  *
  * @see \Drupal\webform\Element\WebformElementStates
- * @see drupal_process_states()
+ * @see \Drupal\Core\Form\FormHelper::processStates
  */
 class WebformSubmissionConditionsValidator implements WebformSubmissionConditionsValidatorInterface {
 
diff --git a/src/WebformSubmissionConditionsValidatorInterface.php b/src/WebformSubmissionConditionsValidatorInterface.php
index 176471627..fdfec7648 100644
--- a/src/WebformSubmissionConditionsValidatorInterface.php
+++ b/src/WebformSubmissionConditionsValidatorInterface.php
@@ -86,7 +86,7 @@ interface WebformSubmissionConditionsValidatorInterface {
    *   processed. NULL is returned when there is an invalid selector or a
    *   missing element in the conditions.
    *
-   * @see drupal_process_states()
+   * @see \Drupal\Core\Form\FormHelper::processStates
    */
   public function validateConditions(array $conditions, WebformSubmissionInterface $webform_submission);
 
diff --git a/webform.module b/webform.module
index b5f1f52eb..a01cd472e 100644
--- a/webform.module
+++ b/webform.module
@@ -23,8 +23,8 @@ use Drupal\webform\Entity\Webform;
 use Drupal\webform\Entity\WebformSubmission;
 use Drupal\webform\Plugin\WebformElement\ManagedFile;
 use Drupal\webform\Utility\Mail;
-use Drupal\webform\Utility\WebformArrayHelper;
 use Drupal\webform\Utility\WebformElementHelper;
+use Drupal\webform\Utility\WebformFormHelper;
 use Drupal\webform\Utility\WebformOptionsHelper;
 use Drupal\webform\WebformInterface;
 
@@ -623,7 +623,7 @@ function _webform_page_attachments(array &$attachments) {
   }
   if (search !== location.search) {
     location.replace(location.pathname + search);
-  } 
+  }
 })();
 "),
           '#weight' => 1000,
@@ -765,19 +765,11 @@ function webform_webform_access_rules() {
  * @param string $key
  *   The element property to add the states attribute to.
  *
- * @see drupal_process_states()
+ * @deprecated Scheduled for removal in Webform 8.x-6.x
+ *   Use \Drupal\Core\Form\FormHelper::processStates instead.
  */
 function webform_process_states(array &$elements, $key = '#attributes') {
-  if (empty($elements['#states'])) {
-    return;
-  }
-
-  $elements['#attached']['library'][] = 'core/drupal.states';
-  $elements[$key]['data-drupal-states'] = Json::encode($elements['#states']);
-  // Make sure to include target class for this container.
-  if (empty($elements[$key]['class']) || !WebformArrayHelper::inArray(['js-form-item', 'js-form-submit', 'js-form-wrapper'], $elements[$key]['class'])) {
-    $elements[$key]['class'][] = 'js-form-item';
-  }
+  WebformFormHelper::processStates($elements, $key);
 }
 
 /******************************************************************************/