diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 77e8abe93b..1426ece5e9 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -75,13 +75,6 @@ addLoadEvent(focusit);
 <ul id="categorychecklist"><?php dropdown_categories(); ?></ul></div>
 </fieldset>
 
-<fieldset id="tagdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Tags') ?></h3>
-<div class="dbx-content">
-<p id="jaxtag"></p>
-<ul id="tagchecklist"><?php dropdown_tags(); ?></ul></div>
-</fieldset>
-
 <fieldset id="commentstatusdiv" class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Discussion') ?></h3>
 <div class="dbx-content">
diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php
index bf2180f96f..afd66765f9 100644
--- a/wp-admin/upgrade-schema.php
+++ b/wp-admin/upgrade-schema.php
@@ -120,20 +120,6 @@ CREATE TABLE $wpdb->posts (
   KEY post_name (post_name),
   KEY type_status_date (post_type,post_status,post_date,ID)
 );
-CREATE TABLE $wpdb->tags (
-  tag_id bigint(20) unsigned NOT NULL auto_increment,
-  tag varchar(30) NOT NULL default '',
-  raw_tag varchar(50) NOT NULL default '',
-  tag_count bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (tag_id)
-);
-CREATE TABLE $wpdb->tagged (
-  tag_id bigint(20) unsigned NOT NULL default '0',
-  post_id bigint(20) unsigned NOT NULL default '0',
-  PRIMARY KEY  (tag_id,post_id),
-  KEY tag_id_index (tag_id),
-  KEY post_id_index (post_id)
-);
 CREATE TABLE $wpdb->users (
   ID bigint(20) unsigned NOT NULL auto_increment,
   user_login varchar(60) NOT NULL default '',
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 2f2373a29c..f1c620286e 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -522,9 +522,6 @@ function wp_insert_post($postarr = array()) {
 	}
 	$post_cat = $post_category[0];
 
-	if ( empty($post_tags) )
-		$post_tags = array();
-
 	if ( empty($post_author) )
 		$post_author = $user_ID;
 
@@ -649,7 +646,6 @@ function wp_insert_post($postarr = array()) {
 	}
 
 	wp_set_post_categories($post_ID, $post_category);
-	wp_set_post_tags($post_ID, $post_tags);
 
 	if ( 'page' == $post_type ) {
 		clean_page_cache($post_ID);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8511a66c3c..1f55e51740 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -3,6 +3,6 @@
 // This holds the version number in a separate file so we can bump it without cluttering the SVN
 
 $wp_version = '2.2-bleeding';
-$wp_db_version = 4815;
+$wp_db_version = 4772;
 
 ?>
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index c2b35f005f..a267be093a 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -34,8 +34,6 @@ class wpdb {
 	var $optiongroups;
 	var $optiongroup_options;
 	var $postmeta;
-	var $tags;
-	var $tagged;
 
 	/**
 	 * Connects to the database server and selects a database
diff --git a/wp-settings.php b/wp-settings.php
index 8e246a2d86..3141bd35ed 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -116,8 +116,6 @@ $wpdb->links          = $wpdb->prefix . 'links';
 $wpdb->options        = $wpdb->prefix . 'options';
 $wpdb->postmeta       = $wpdb->prefix . 'postmeta';
 $wpdb->usermeta       = $wpdb->prefix . 'usermeta';
-$wpdb->tags           = $wpdb->prefix . 'tags';
-$wpdb->tagged         = $wpdb->prefix . 'tagged';
 
 if ( defined('CUSTOM_USER_TABLE') )
 	$wpdb->users = CUSTOM_USER_TABLE;