diff --git a/README.md b/README.md
index 2608db11f2..9ddf77b095 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,10 @@ Open Source Projects Used
 
 Changelog
 ---------
+**version 2.6.4p1 (released 4/13/2015)**
+- revert support-v4 and appcompat-v7 to v21.0.3 due to contextual action
+bar bug. see https://code.google.com/p/android/issues/detail?id=165243
+
 **version 2.6.4 (released 4/13/2015)**
 - minor fixes for crashes
 - since it seems that the notification crashes happen at random, and only
diff --git a/app/build.gradle b/app/build.gradle
index 6446fe8c3c..ff1712ab99 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 21
     buildToolsVersion "22.0.1"
 
     lintOptions {
@@ -12,9 +12,9 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
-        versionCode 2640
-        versionName "2.6.4"
+        targetSdkVersion 21
+        versionCode 2641
+        versionName "2.6.4-p1"
     }
 
     signingConfigs {
@@ -45,8 +45,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:22.0.0'
-    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:recyclerview-v7:21.0.0'
     compile 'io.reactivex:rxjava:1.0.9'
     compile 'io.reactivex:rxandroid:0.24.0'