diff --git a/includes/form.inc b/includes/form.inc
index 30d394cc68a90087314fd8ccd146674052a80e3a..8df13ab5ae0c449e0bbe0ba4dbf916c8c6a71f13 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -2610,11 +2610,7 @@ function theme_form_element($element) {
     $class[] = strtr($element['#name'], array('_' => '-', '[' => '-', ']' => '')) . '-wrapper';
   }
 
-  $output = '<div class="' . implode(' ', $class) . '"';
-  if (!empty($element['#id'])) {
-    $output .= ' id="' . $element['#id'] . '-wrapper"';
-  }
-  $output .= ">\n";
+  $output = '<div class="' . implode(' ', $class) . '">' . "\n";
   $required = !empty($element['#required']) ? '<span class="form-required" title="' . $t('This field is required.') . '">*</span>' : '';
 
   if (!empty($element['#title']) && empty($element['#form_element_skip_title'])) {
diff --git a/modules/book/book.css b/modules/book/book.css
index 4c1ee0e2ebfd036e62ca0ebcd859f38439845ad2..8c62e4ae9691a7250b7dfc6f50d82f2c4c4f034f 100644
--- a/modules/book/book.css
+++ b/modules/book/book.css
@@ -38,7 +38,7 @@
 html.js #edit-book-pick-book {
   display: none;
 }
-#edit-book-bid-wrapper .description {
+.form-item-book-bid-wrapper .description {
   clear: both;
 }
 #book-admin-edit select {
diff --git a/modules/dblog/dblog-rtl.css b/modules/dblog/dblog-rtl.css
index e938aff0b9b9d4d6a6ee1745bd188b963bd009a9..9684b54c555a6b0a6bb01e451d7ed0167cfdd07f 100644
--- a/modules/dblog/dblog-rtl.css
+++ b/modules/dblog/dblog-rtl.css
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#edit-type-wrapper, #edit-severity-wrapper {
+.form-item-type-wrapper, .form-item-severity-wrapper {
   float: right;
   padding-right: 0;
   padding-left: .8em;
diff --git a/modules/dblog/dblog.css b/modules/dblog/dblog.css
index f293b9fafc1941134704e4edb9c2eede1518dc02..9f9a94d56bf43aaa292136493dbf78f024a159ab 100644
--- a/modules/dblog/dblog.css
+++ b/modules/dblog/dblog.css
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#edit-type-wrapper, #edit-severity-wrapper {
+.form-item-type-wrapper, .form-item-severity-wrapper {
   float: left; /* LTR */
   padding-right: .8em; /* LTR */
   margin: 0.1em;
diff --git a/modules/locale/locale.css b/modules/locale/locale.css
index b73d5b48b7627f2cce99dfea10329a78d77c2b94..b6b89478e5fed4b1a19efb019ffdec195c0371d8 100644
--- a/modules/locale/locale.css
+++ b/modules/locale/locale.css
@@ -5,7 +5,7 @@
   text-decoration: line-through;
 }
 
-#edit-language-wrapper, #edit-translation-wrapper, #edit-group-wrapper {
+.form-item-language-wrapper, .form-item-translation-wrapper, .form-item-group-wrapper {
   float: left; /* LTR */
   padding-right: .8em; /* LTR */
   margin: 0.1em;
diff --git a/modules/node/content_types.js b/modules/node/content_types.js
index bee78bc8316749c3917727ce5966436e2d093c4e..e182d3452502bd55b619fe955d6c44bdaf8dac9b 100644
--- a/modules/node/content_types.js
+++ b/modules/node/content_types.js
@@ -4,13 +4,13 @@
 Drupal.behaviors.contentTypes = {
   attach: function () {
     if ($('#edit-type').val() == $('#edit-name').val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_') || $('#edit-type').val() == '') {
-      $('#edit-type-wrapper').hide();
+      $('.form-item-type-wrapper').hide();
       $('#edit-name').keyup(function () {
         var machine = $(this).val().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/_+/g, '_');
         if (machine != '_' && machine != '') {
           $('#edit-type').val(machine);
           $('#node-type-name-suffix').empty().append(' Machine name: ' + machine + ' [').append($('<a href="#">' + Drupal.t('Edit') + '</a>').click(function () {
-            $('#edit-type-wrapper').show();
+            $('.form-item-type-wrapper').show();
             $('#node-type-name-suffix').hide();
             $('#edit-name').unbind('keyup');
             return false;
diff --git a/modules/openid/openid.css b/modules/openid/openid.css
index 844696fada375d5ffa4c7d84a544006f30c84d91..99444707be90324db656b2eef6ccce5433b4c132 100644
--- a/modules/openid/openid.css
+++ b/modules/openid/openid.css
@@ -6,11 +6,11 @@
   background-repeat: no-repeat;
   padding-left: 20px;
 }
-div#edit-openid-identifier-wrapper {
+div.form-item-openid-identifier-wrapper {
   display: block;
 }
-html.js #user-login-form div#edit-openid-identifier-wrapper,
-html.js #user-login div#edit-openid-identifier-wrapper {
+html.js #user-login-form div.form-item-openid-identifier-wrapper,
+html.js #user-login div.form-item-openid-identifier-wrapper {
   display: none;
 }
 html.js #user-login-form li.openid-link,
diff --git a/modules/openid/openid.js b/modules/openid/openid.js
index 78c1d2b3f8aa4fd4b939211574a333dd77fc8081..152bf10cb2ba9f46271e6061a00dbb1b85abc06a 100644
--- a/modules/openid/openid.js
+++ b/modules/openid/openid.js
@@ -3,8 +3,8 @@
 
 Drupal.behaviors.openid = {
   attach: function (context) {
-    var loginElements = $('#edit-name-wrapper, #edit-pass-wrapper, li.openid-link');
-    var openidElements = $('#edit-openid-identifier-wrapper, li.user-link');
+    var loginElements = $('.form-item-name-wrapper, .form-item-pass-wrapper, li.openid-link');
+    var openidElements = $('.form-item-openid-identifier-wrapper, li.user-link');
 
     // This behavior attaches by ID, so is only valid once on a page.
     if (!$('#edit-openid-identifier.openid-processed').size() && $('#edit-openid-identifier').val()) {