diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
index b7cc7a7..1903267 100644
--- a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
+++ b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java
@@ -41,7 +41,6 @@ import java.util.zip.ZipFile;
 
 public class CodePush {
 
-    private static int rollbackTimeout = 0;
     private boolean resumablePendingUpdateAvailable = false;
     private boolean didUpdate = false;
     private Timer timer;
@@ -89,11 +88,6 @@ public class CodePush {
         }
 
         checkForPendingUpdate(/*needsRestart*/ false);
-
-        if (0 != rollbackTimeout) {
-            startRollbackTimer(rollbackTimeout);
-            rollbackTimeout = 0;
-        }
     }
 
     public ReactPackage getReactPackage() {
@@ -191,7 +185,9 @@ public class CodePush {
             codePushNativeModule.loadBundle();
         }
 
-        CodePush.rollbackTimeout = rollbackTimeout;
+        if (0 != rollbackTimeout) {
+            startRollbackTimer(rollbackTimeout);
+        }
     }
 
     private boolean isFailedHash(String packageHash) {
@@ -286,7 +282,7 @@ public class CodePush {
         private void loadBundle() {
             Intent intent = mainActivity.getIntent();
             mainActivity.finish();
-            applicationContext.startActivity(intent);
+            mainActivity.startActivity(intent);
         }
 
         @ReactMethod