diff --git a/honeypot.module b/honeypot.module
index fe284e3..5856f1d 100644
--- a/honeypot.module
+++ b/honeypot.module
@@ -138,9 +138,8 @@ function honeypot_add_form_protection(&$form, FormStateInterface $form_state, $o
   if (in_array('time_restriction', $options) && \Drupal::config('honeypot.settings')->get('time_limit') != 0) {
     // Set the current time in a hidden value to be checked later.
     $form['honeypot_time'] = [
-      '#type' => 'hidden',
+      '#type' => 'value',
       '#title' => t('Timestamp'),
-      '#default_value' => honeypot_get_signed_timestamp(time()),
       '#element_validate' => ['_honeypot_time_restriction_validate'],
       '#cache' => [
         'max-age' => 0,
@@ -187,7 +186,7 @@ function _honeypot_time_restriction_validate($element, FormStateInterface $form_
   }
 
   // Get the time value.
-  $honeypot_time = honeypot_get_time_from_signed_timestamp($form_state->getValue('honeypot_time'));
+  $honeypot_time = $form_state->getValue('honeypot_time');
 
   // Get the honeypot_time_limit.
   $time_limit = honeypot_get_time_limit($form_state->getValues());
@@ -197,7 +196,7 @@ function _honeypot_time_restriction_validate($element, FormStateInterface $form_
   if (!$honeypot_time || time() < ($honeypot_time + $time_limit)) {
     _honeypot_log($form_state->getValue('form_id'), 'honeypot_time');
     $time_limit = honeypot_get_time_limit();
-    $form_state->setValue('honeypot_time', honeypot_get_signed_timestamp(time()));
+    $form_state->setValue('honeypot_time', time());
     $form_state->setErrorByName('', t('There was a problem with your form submission. Please wait @limit seconds and try again.', ['@limit' => $time_limit]));
   }
 }
@@ -295,49 +294,3 @@ function honeypot_log_failure($form_id, $type) {
   // TODO - Only accepts two args.
   \Drupal::moduleHandler()->invokeAll('honeypot_reject', [$form_id, $uid, $type]);
 }
-
-/**
- * Sign the timestamp $time.
- *
- * @param mixed $time
- *   The timestamp to sign.
- *
- * @return string
- *   A signed timestamp in the form timestamp|HMAC.
- */
-function honeypot_get_signed_timestamp($time) {
-  $private_key = Drupal::service('private_key')->get();
-  return $time . '|' . Crypt::hmacBase64($time, $private_key);
-}
-
-/**
- * Validate a signed timestamp.
- *
- * @param string $signed_timestamp
- *   A timestamp concateneted with the signature
- *
- * @return int
- *   The timestamp if the signature is correct, 0 otherwise.
- */
-function honeypot_get_time_from_signed_timestamp($signed_timestamp) {
-  $honeypot_time = 0;
-
-  // Fail fast if timestamp was forged.
-  if (strpos($signed_timestamp, '|') === FALSE) {
-    return $honeypot_time;
-  }
-
-  list($timestamp, $received_hmac) = explode('|', $signed_timestamp);
-
-  if ($timestamp && $received_hmac) {
-    $private_key = Drupal::service('private_key')->get();
-    $calculated_hmac = Crypt::hmacBase64($timestamp, $private_key);
-    // Prevent leaking timing information, compare second order hmacs.
-    $random_key = Crypt::randomBytes(32);
-    if (Crypt::hmacBase64($calculated_hmac, $random_key) === Crypt::hmacBase64($received_hmac, $random_key)) {
-      $honeypot_time = $timestamp;
-    }
-  }
-
-  return $honeypot_time;
-}
diff --git a/src/Controller/HoneypotSettingsController.php b/src/Controller/HoneypotSettingsController.php
index 223a45e..6fe8296 100644
--- a/src/Controller/HoneypotSettingsController.php
+++ b/src/Controller/HoneypotSettingsController.php
@@ -209,20 +209,6 @@ class HoneypotSettingsController extends ConfigFormBase {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    // Make sure the time limit is a positive integer or 0.
-    $time_limit = $form_state->getValue('time_limit');
-    if ((is_numeric($time_limit) && $time_limit > 0) || $time_limit === '0') {
-      if (ctype_digit($time_limit)) {
-        // Good to go.
-      }
-      else {
-        $form_state->setErrorByName('time_limit', t("The time limit must be a positive integer or 0."));
-      }
-    }
-    else {
-      $form_state->setErrorByName('time_limit', t("The time limit must be a positive integer or 0."));
-    }
-
     // Make sure Honeypot element name only contains A-Z, 0-9.
     if (!preg_match("/^[-_a-zA-Z0-9]+$/", $form_state->getValue('element_name'))) {
       $form_state->setErrorByName('element_name', t("The element name cannot contain spaces or other special characters."));
diff --git a/src/Tests/HoneypotFormTest.php b/src/Tests/HoneypotFormTest.php
index 51f1449..5642e0a 100644
--- a/src/Tests/HoneypotFormTest.php
+++ b/src/Tests/HoneypotFormTest.php
@@ -180,7 +180,7 @@ class HoneypotFormTest extends WebTestBase {
     $this->drupalLogin($this->webUser);
 
     // Reset the time limit to 5 seconds.
-    $honeypot_config = \Drupal::configFactory()->getEditable('honeypot.settings')->set('time_limit', 5)->save();
+    \Drupal::configFactory()->getEditable('honeypot.settings')->set('time_limit', 5)->save();
 
     // Set up the form and submit it.
     $edit["title[0][value]"] = 'Test Page';