diff --git a/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java b/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java
index 5c68c1e..4c93b7c 100644
--- a/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java
+++ b/app/src/main/java/com/google/reviewit/ReviewChangesFragment.java
@@ -14,6 +14,7 @@
 
 package com.google.reviewit;
 
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.util.Log;
@@ -28,7 +29,6 @@
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.reviewit.app.Change;
 import com.google.reviewit.app.QueryHandler;
-import com.google.reviewit.util.ObservableAsynTask;
 import com.google.reviewit.util.TaskObserver;
 import com.google.reviewit.widget.ChangeEntry;
 
@@ -80,7 +80,7 @@
       return;
     }
 
-    new ObservableAsynTask<Void, Void, ChangeListData>() {
+    new AsyncTask<Void, Void, ChangeListData>() {
       private View progress;
       private View initialProgress;
       private View reloadButton;
@@ -88,8 +88,8 @@
       private ViewGroup changeList;
 
       @Override
-      protected void preExecute() {
-        super.preExecute();
+      protected void onPreExecute() {
+        super.onPreExecute();
         progress = v(R.id.progress);
         initialProgress = v(R.id.initialProgress);
         reloadButton = v(R.id.reloadButton);
@@ -118,8 +118,9 @@
         }
       }
 
-      protected void postExecute(ChangeListData changeListData) {
-        super.postExecute(changeListData);
+      @Override
+      protected void onPostExecute(ChangeListData changeListData) {
+        super.onPostExecute(changeListData);
 
         if (getActivity() == null) {
           // user navigated away while we were waiting for the request
diff --git a/app/src/main/res/layout/progress.xml b/app/src/main/res/layout/progress.xml
index 8da14a2..71c92ad 100644
--- a/app/src/main/res/layout/progress.xml
+++ b/app/src/main/res/layout/progress.xml
@@ -23,4 +23,5 @@
   android:maxHeight="2dp"
   android:minHeight="2dp"
   android:indeterminateDrawable="@drawable/progress"
-  style="?android:attr/progressBarStyleHorizontal"/>
\ No newline at end of file
+  style="?android:attr/progressBarStyleHorizontal"
+  android:visibility="invisible"/>
\ No newline at end of file
