diff --git a/res/layout/contact_picker.xml b/res/layout/contact_picker.xml
index 3724f8f..671b766 100644
--- a/res/layout/contact_picker.xml
+++ b/res/layout/contact_picker.xml
@@ -14,21 +14,21 @@
      limitations under the License.
 -->
 
-<view
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    class="com.android.contacts.widget.FullHeightLinearLayout"
     style="@style/ContactPickerLayout"
-    android:paddingLeft="20dip"
-    android:paddingRight="20dip"
-    android:orientation="vertical">
+    android:paddingLeft="32dip"
+    android:paddingRight="32dip"
+    android:orientation="vertical"
+    android:layout_height="match_parent">
     <view
         class="android.widget.SearchView"
         android:id="@+id/search_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="40dip"
+        android:layout_marginLeft="10dip"
+        android:layout_marginRight="10dip"
         android:layout_marginBottom="10dip"
-        android:layout_marginRight="5dip"
         android:iconifiedByDefault="false" />
     <FrameLayout
         android:layout_width="match_parent"
@@ -48,4 +48,4 @@
             android:layout_height="wrap_content"
             android:text="@android:string/cancel"/>
     </LinearLayout>
-</view>
+</LinearLayout>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index 6410840..d1ff6f4 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -71,8 +71,6 @@
     <style name="ContactPickerLayout" parent="ContactPickerTheme">
         <item name="android:layout_width">480dip</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_marginTop">40dip</item>
-        <item name="android:layout_marginBottom">10dip</item>
     </style>
 
     <style name="CallDetailActivityTheme" parent="@android:Theme.Dialog">
diff --git a/src/com/android/contacts/widget/FullHeightLinearLayout.java b/src/com/android/contacts/widget/FullHeightLinearLayout.java
deleted file mode 100644
index f9548a6..0000000
--- a/src/com/android/contacts/widget/FullHeightLinearLayout.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.LinearLayout;
-
-/**
- * A custom layout for dialogs that need to be stretched to the full height of the screen.
- * It overrides the height measure specification to ignore "wrap_content" and
- * do "match_parent" instead.  The "wrap_content" part is hard-coded in the framework
- * implementation of the dialog theme.
- */
-public final class FullHeightLinearLayout extends LinearLayout {
-
-    public FullHeightLinearLayout(Context context) {
-        super(context);
-    }
-
-    public FullHeightLinearLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public FullHeightLinearLayout(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.AT_MOST) {
-            heightMeasureSpec = MeasureSpec.makeMeasureSpec(
-                    MeasureSpec.getSize(heightMeasureSpec), MeasureSpec.EXACTLY);
-        }
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-}