diff --git a/src/com/android/phone/common/HapticFeedback.java b/src/com/android/phone/common/HapticFeedback.java
index f19b8a6..2b17523 100644
--- a/src/com/android/phone/common/HapticFeedback.java
+++ b/src/com/android/phone/common/HapticFeedback.java
@@ -19,7 +19,6 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
-import android.os.SystemVibrator;
 import android.os.Vibrator;
 import android.provider.Settings;
 import android.provider.Settings.System;
@@ -88,9 +87,7 @@
     public void init(Context context, boolean enabled) {
         mEnabled = enabled;
         if (enabled) {
-            // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this
-            // vibrator object will be isolated from others.
-            mVibrator = new SystemVibrator(context);
+            mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
             mHapticPattern = new long[] {0, DURATION, 2 * DURATION, 3 * DURATION};
             mSystemSettings = new Settings.System();
             mContentResolver = context.getContentResolver();
