diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e92de57..383ffe0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,9 +4,9 @@
      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.
@@ -40,27 +40,11 @@
              (android.test) library. -->
         <uses-library android:name="android.test.runner" />
 
-        <!-- NOTE: to use new calendar provider, comment out CalendarProvider
-        and CalendarSyncAdapterService, and uncomment CalendarProvider2 -->
-        <provider android:name="CalendarProvider" android:authorities="calendar"
-                android:label="@string/provider_label"
-                android:multiprocess="false"
-                android:readPermission="android.permission.READ_CALENDAR"
-                android:writePermission="android.permission.WRITE_CALENDAR" />
-        <service android:name="CalendarSyncAdapterService" android:exported="true">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-            <meta-data android:name="android.content.SyncAdapter"
-                       android:resource="@xml/syncadapter" />
-        </service>
-        <!--
         <provider android:name="CalendarProvider2" android:authorities="calendar"
                 android:label="@string/provider_label"
                 android:multiprocess="false"
                 android:readPermission="android.permission.READ_CALENDAR"
                 android:writePermission="android.permission.WRITE_CALENDAR" />
-        -->
 
         <activity android:name="CalendarContentProviderTests" android:label="Calendar Content Provider">
             <intent-filter>