diff --git a/modules/product/includes/commerce_product.forms.inc b/modules/product/includes/commerce_product.forms.inc
index fa58bd3..081ed5c 100644
--- a/modules/product/includes/commerce_product.forms.inc
+++ b/modules/product/includes/commerce_product.forms.inc
@@ -20,7 +20,6 @@ function commerce_product_product_form($form, &$form_state, $product) {
   $form_state['build_info']['files']['form'] = drupal_get_path('module', 'commerce_product') . '/includes/commerce_product.forms.inc';
 
   // Add the default field elements.
-  // TODO: Update description to include the acceptable product tokens.
   $form['sku'] = array(
     '#type' => 'textfield',
     '#title' => t('Product SKU'),
@@ -124,32 +123,21 @@ function commerce_product_product_form($form, &$form_state, $product) {
 function commerce_product_product_form_validate($form, &$form_state) {
   $product = $form_state['commerce_product'];
 
-  // TODO: Resolve workflow issues pertaining to token replacement in SKUs.
-  // Perform token replacement on the entered SKU.
-  // $sku = commerce_product_replace_sku_tokens($form_state['values']['sku'], $product);
-
-  // Until the above is resolved, simply use the SKU as entered with no tokens.
   $sku = $form_state['values']['sku'];
 
-  // If invalid tokens were specified, throw an error.
-  if ($sku === FALSE) {
-    form_set_error('sku', t('The SKU contains invalid tokens.'));
+  // Ensure the proposed SKU is unique.
+  if (!commerce_product_validate_sku_unique($sku, $product->product_id)) {
+    form_set_error('sku', t('This SKU is already in use and must be unique. Please supply another value.'));
   }
-  else {
-    // Ensure the proposed SKU is unique.
-    if (!commerce_product_validate_sku_unique($sku, $product->product_id)) {
-      form_set_error('sku', t('This SKU is already in use and must be unique. Please supply another value.'));
-    }
-
-    // Validate the SKU for invalid characters.
-    if (!commerce_product_validate_sku($sku)) {
-      form_set_error('sku', t('The SKU %sku contains invalid characters.', array('%sku' => $sku)));
-    }
-
-    // Trim leading and trailing whitespace from the SKU.
-    form_set_value($form['sku'], trim($sku), $form_state);
+
+  // Validate the SKU for invalid characters.
+  if (!commerce_product_validate_sku($sku)) {
+    form_set_error('sku', t('The SKU %sku contains invalid characters.', array('%sku' => $sku)));
   }
 
+  // Trim leading and trailing whitespace from the SKU.
+  form_set_value($form['sku'], trim($sku), $form_state);
+
   // Notify field widgets to validate their data.
   field_attach_form_validate('commerce_product', $product, $form, $form_state);
 }