diff --git a/src/manipulation/wrapMap.js b/src/manipulation/wrapMap.js
index 505e091f8..e5e5acdab 100644
--- a/src/manipulation/wrapMap.js
+++ b/src/manipulation/wrapMap.js
@@ -9,21 +9,13 @@ var wrapMap = {
 	// Support: IE8
 	param: [ 1, "<object>", "</object>" ],
 
+	// XHTML parsers do not magically insert elements in the
+	// same way that tag soup parsers do. So we cannot shorten
+	// this by omitting <tbody> or other required elements.
 	thead: [ 1, "<table>", "</table>" ],
-
-	// Some of the following wrappers are not fully defined, because
-	// their parent elements (except for "table" element) could be omitted
-	// since browser parsers are smart enough to auto-insert them
-
-	// Support: Android 2.3
-	// Android browser doesn't auto-insert colgroup
 	col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-
-	// Auto-insert "tbody" element
-	tr: [ 2, "<table>", "</table>" ],
-
-	// Auto-insert "tbody" and "tr" elements
-	td: [ 3, "<table>", "</table>" ],
+	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
 
 	// IE8 can't serialize link, script, style, or any html5 (NoScope) tags,
 	// unless wrapped in a div with non-breaking characters in front of it.