diff --git a/proguard.flags b/proguard.flags
index e7d00c6..607c14b 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -5,7 +5,6 @@
   public void onClickSearchButton(android.view.View);
   public void onClickConfigureButton(android.view.View);
   public void onClickAllAppsButton(android.view.View);
-  public void onClickRotateButton(android.view.View);
 }
 
 -keep class com.android.launcher2.CellLayout {
diff --git a/res/layout-xlarge/launcher.xml b/res/layout-xlarge/launcher.xml
index 3e00381..8133853 100644
--- a/res/layout-xlarge/launcher.xml
+++ b/res/layout-xlarge/launcher.xml
@@ -45,32 +45,16 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <RelativeLayout
-        android:id="@+id/search_button_cluster"
+    <ImageView
+        android:id="@+id/search_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|left">
+        android:layout_gravity="top|left"
+        android:src="@drawable/search_button"
 
-        <ImageView
-            android:id="@+id/search_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/search_button"
-
-            android:onClick="onClickSearchButton"
-            android:focusable="true"
-            android:clickable="true"/>
-        <ImageView
-            android:id="@+id/rotate_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/rotate_button"
-
-            android:onClick="onClickRotateButton"
-            android:focusable="true"
-            android:clickable="true"
-            android:layout_toRightOf="@id/search_button" />
-    </RelativeLayout>
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"/>
 
     <RelativeLayout
         android:id="@+id/all_apps_button_cluster"
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 41f9e7d..4378af1 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1679,19 +1679,6 @@
     }
 
     /**
-     * Temporary: to allow us to test rotation in the launcher.
-     *
-     * @param v The view that was clicked.
-     */
-    public void onClickRotateButton(View v) {
-        // TODO: this method is temporary. Remove it.
-            setRequestedOrientation(
-                (getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
-                    ? ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-                    : ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    }
-
-    /**
      * Event handler for the "grid" button that appears on the home screen, which
      * enters all apps mode.
      *