diff --git a/Classes/BITAuthenticationViewController.m b/Classes/BITAuthenticationViewController.m
index f9a495a4fd..addbfd1815 100644
--- a/Classes/BITAuthenticationViewController.m
+++ b/Classes/BITAuthenticationViewController.m
@@ -294,7 +294,7 @@
                                      if(succeeded) {
                                        //controller should dismiss us shortly..
                                      } else {
-                                       
+                                       /* We won't use this for now until we have a more robust solution for displaying UIAlertController
                                        // requires iOS 8
                                        id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
                                        if (uialertcontrollerClass) {
@@ -311,6 +311,7 @@
                                          
                                          [self presentViewController:alertController animated:YES completion:nil];
                                        } else {
+                                        */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
                                          UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil
@@ -320,7 +321,7 @@
                                                                                    otherButtonTitles:nil];
                                          [alertView show];
 #pragma clang diagnostic pop
-                                       }
+                                       /*}*/
                                        typeof(self) strongSelf = weakSelf;
                                        [strongSelf setLoginUIEnabled:YES];
                                      }
diff --git a/Classes/BITAuthenticator.m b/Classes/BITAuthenticator.m
index 7e7bb61194..753bd51465 100644
--- a/Classes/BITAuthenticator.m
+++ b/Classes/BITAuthenticator.m
@@ -255,7 +255,7 @@ static unsigned char kBITPNGEndChunk[4] = {0x49, 0x45, 0x4e, 0x44};
       [self dismissAuthenticationControllerAnimated:YES completion:nil];
     } else {
       BITHockeyLog(@"Validation failed with error: %@", error);
-      
+      /* We won't use this for now until we have a more robust solution for displaying UIAlertController
       // requires iOS 8
       id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
       if (uialertcontrollerClass) {
@@ -277,6 +277,7 @@ static unsigned char kBITPNGEndChunk[4] = {0x49, 0x45, 0x4e, 0x44};
         
         [self showAlertController:alertController];
       } else {
+       */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil
@@ -287,7 +288,7 @@ static unsigned char kBITPNGEndChunk[4] = {0x49, 0x45, 0x4e, 0x44};
         [alertView setTag:0];
         [alertView show];
 #pragma clang diagnostic pop
-      }
+      /*}*/
     }
   }];
 }
diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m
index 2d446a5373..59060c5d15 100644
--- a/Classes/BITCrashManager.m
+++ b/Classes/BITCrashManager.m
@@ -1048,6 +1048,7 @@ static void uncaught_cxx_exception_handler(const BITCrashUncaughtCXXExceptionInf
       if (_alertViewHandler) {
         _alertViewHandler();
       } else {
+        /* We won't use this for now until we have a more robust solution for displaying UIAlertController
         // requires iOS 8
         id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
         if (uialertcontrollerClass) {
@@ -1090,6 +1091,7 @@ static void uncaught_cxx_exception_handler(const BITCrashUncaughtCXXExceptionInf
           
           [self showAlertController:alertController];
         } else {
+         */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
           UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:[NSString stringWithFormat:BITHockeyLocalizedString(@"CrashDataFoundTitle"), appName]
@@ -1104,7 +1106,7 @@ static void uncaught_cxx_exception_handler(const BITCrashUncaughtCXXExceptionInf
           
           [alertView show];
 #pragma clang diagnostic pop
-        }
+        /*}*/
       }
 #endif /* !defined (HOCKEYSDK_CONFIGURATION_ReleaseCrashOnlyExtensions) */
       
diff --git a/Classes/BITFeedbackComposeViewController.m b/Classes/BITFeedbackComposeViewController.m
index 33dc781dc7..4620bd9738 100644
--- a/Classes/BITFeedbackComposeViewController.m
+++ b/Classes/BITFeedbackComposeViewController.m
@@ -538,7 +538,7 @@
   NSInteger index = [self.attachmentScrollViewImageViews indexOfObject:sender];
   
   self.selectedAttachmentIndex = (self.attachmentScrollViewImageViews.count - index - 1);
-  
+  /* We won't use this for now until we have a more robust solution for displaying UIAlertController
   // requires iOS 8
   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
   if (uialertcontrollerClass) {
@@ -578,6 +578,7 @@
     
     [self presentViewController:alertController animated:YES completion:nil];
   } else {
+   */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
   UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle: nil
@@ -588,7 +589,7 @@
   
   [actionSheet showFromRect: sender.frame inView: self.attachmentScrollView animated: YES];
 #pragma clang diagnostic push
-  }
+  /*}*/
   
   _actionSheetVisible = YES;
   if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
diff --git a/Classes/BITFeedbackListViewController.m b/Classes/BITFeedbackListViewController.m
index c7b74388a4..8d2ef7a173 100644
--- a/Classes/BITFeedbackListViewController.m
+++ b/Classes/BITFeedbackListViewController.m
@@ -289,6 +289,7 @@
 }
 
 - (void)deleteAllMessagesAction:(id)sender {
+  /* We won't use this for now until we have a more robust solution for displaying UIAlertController
   // requires iOS 8
   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
   if (uialertcontrollerClass) {
@@ -326,6 +327,7 @@
     
     [self presentViewController:alertController animated:YES completion:nil];
   } else {
+   */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
@@ -349,7 +351,7 @@
       [deleteAction show];
     }
 #pragma clang diagnostic pop
-  }
+  /*}*/
 }
 
 - (UIView*) viewForShowingActionSheetOnPhone {
@@ -828,6 +830,7 @@
 #pragma mark - BITAttributedLabelDelegate
 
 - (void)attributedLabel:(BITAttributedLabel *)label didSelectLinkWithURL:(NSURL *)url {
+  /*
   // requires iOS 8
   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
   if (uialertcontrollerClass) {
@@ -867,6 +870,7 @@
     
     [self presentViewController:linkAction animated:YES completion:nil];
   } else {
+   */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
@@ -891,7 +895,7 @@
       [linkAction show];
     }
 #pragma clang diagnostic pop
-  }
+  /*}*/
 }
 
 
diff --git a/Classes/BITFeedbackManager.m b/Classes/BITFeedbackManager.m
index e3a5fe5f86..0caec16a9b 100644
--- a/Classes/BITFeedbackManager.m
+++ b/Classes/BITFeedbackManager.m
@@ -799,6 +799,7 @@ NSString *const kBITFeedbackUpdateAttachmentThumbnail = @"BITFeedbackUpdateAttac
         }
         
         if(self.showAlertOnIncomingMessages && !self.currentFeedbackListViewController && !self.currentFeedbackComposeViewController) {
+          /*
           // Requires iOS 8
           id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
           if (uialertcontrollerClass) {
@@ -819,6 +820,7 @@ NSString *const kBITFeedbackUpdateAttachmentThumbnail = @"BITFeedbackUpdateAttac
             
             [self showAlertController:alertController];
           } else {
+           */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:BITHockeyLocalizedString(@"HockeyFeedbackNewMessageTitle")
@@ -830,7 +832,7 @@ NSString *const kBITFeedbackUpdateAttachmentThumbnail = @"BITFeedbackUpdateAttac
             [alertView setTag:0];
             [alertView show];
 #pragma clang diagnostic pop
-          }
+          /*}*/
           _incomingMessagesAlertShowing = YES;
         }
       }
diff --git a/Classes/BITHockeyBaseManager.m b/Classes/BITHockeyBaseManager.m
index 25410d14a8..74c9810cd8 100644
--- a/Classes/BITHockeyBaseManager.m
+++ b/Classes/BITHockeyBaseManager.m
@@ -232,7 +232,7 @@
   
   return parentViewController;
 }
-
+/* We won't use this for now until we have a more robust solution for displaying UIAlertController
 - (void)showAlertController:(UIViewController *)alertController {
   
   // always execute this on the main thread
@@ -252,6 +252,7 @@
     }
   });
 }
+*/
 
 - (void)showView:(UIViewController *)viewController {
   // if we compile Crash only, then BITHockeyBaseViewController is not included
diff --git a/Classes/BITHockeyBaseManagerPrivate.h b/Classes/BITHockeyBaseManagerPrivate.h
index 9c42123766..36828334ca 100644
--- a/Classes/BITHockeyBaseManagerPrivate.h
+++ b/Classes/BITHockeyBaseManagerPrivate.h
@@ -80,8 +80,10 @@
  *
  *  @param alertController The UIAlertController to be presented.
  */
+/* We won't use this for now until we have a more robust solution for displaying UIAlertController
 - (void)showAlertController:(UIViewController *)alertController;
-- (void)showView:(UIViewController *)viewController;
+*/
+ - (void)showView:(UIViewController *)viewController;
 #endif
 
 // Date helpers
diff --git a/Classes/BITStoreUpdateManager.m b/Classes/BITStoreUpdateManager.m
index dfca526b9a..cd6d8e70f2 100644
--- a/Classes/BITStoreUpdateManager.m
+++ b/Classes/BITStoreUpdateManager.m
@@ -435,7 +435,7 @@
 - (void)showUpdateAlert {
   if (!_updateAlertShowing) {
     NSString *versionString = [NSString stringWithFormat:@"%@ %@", BITHockeyLocalizedString(@"UpdateVersion"), _newStoreVersion];
-    
+    /* We won't use this for now until we have a more robust solution for displaying UIAlertController
     // requires iOS 8
     id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
     if (uialertcontrollerClass) {
@@ -475,6 +475,7 @@
       
       [self showAlertController:alertController];
     } else {
+     */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
       UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:BITHockeyLocalizedString(@"UpdateAvailable")
@@ -485,7 +486,7 @@
                                 ];
       [alertView show];
 #pragma clang diagnostic pop
-    }
+    /*}*/
     
     _updateAlertShowing = YES;
   }
diff --git a/Classes/BITUpdateManager.m b/Classes/BITUpdateManager.m
index e6784aed30..249d214d27 100644
--- a/Classes/BITUpdateManager.m
+++ b/Classes/BITUpdateManager.m
@@ -93,6 +93,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
   
   // only show error if we enable that
   if (_showFeedback) {
+    /* We won't use this for now until we have a more robust solution for displaying UIAlertController
     // requires iOS 8
     id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
     if (uialertcontrollerClass) {
@@ -109,6 +110,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
       
       [self showAlertController:alertController];
     } else {
+     */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
       UIAlertView *alert = [[UIAlertView alloc] initWithTitle:BITHockeyLocalizedString(@"UpdateError")
@@ -118,7 +120,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
                                             otherButtonTitles:nil];
       [alert show];
 #pragma clang diagnostic pop
-    }
+    /*}*/
     _showFeedback = NO;
   }
 }
@@ -555,6 +557,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
     NSString *title = BITHockeyLocalizedString(@"UpdateAvailable");
     NSString *message = [NSString stringWithFormat:BITHockeyLocalizedString(@"UpdateAlertMandatoryTextWithAppVersion"), [self.newestAppVersion nameAndVersionString]];
     if ([self hasNewerMandatoryVersion]) {
+      /* We won't use this for now until we have a more robust solution for displaying UIAlertController
       // requires iOS 8
       id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
       if (uialertcontrollerClass) {
@@ -589,6 +592,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
       
         [self showAlertController:alertController];
       } else {
+       */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title
@@ -600,11 +604,11 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
         [alertView setTag:BITUpdateAlertViewTagMandatoryUpdate];
         [alertView show];
 #pragma clang diagnostic pop
-      }
+      /*}*/
       _updateAlertShowing = YES;
     } else {
       message = [NSString stringWithFormat:BITHockeyLocalizedString(@"UpdateAlertTextWithAppVersion"), [self.newestAppVersion nameAndVersionString]];
-      
+      /* We won't use this for now until we have a more robust solution for displaying UIAlertController
       // requires iOS 8
       id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
       if (uialertcontrollerClass) {
@@ -653,6 +657,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
         
         [self showAlertController:alertController ];
       } else {
+       */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:title
@@ -667,7 +672,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
         [alertView setTag:BITUpdateAlertViewTagDefaultUpdate];
         [alertView show];
 #pragma clang diagnostic pop
-      }
+      /*}*/
       _updateAlertShowing = YES;
     }
   }
@@ -741,6 +746,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
 
 // nag the user with neverending alerts if we cannot find out the window for presenting the covering sheet
 - (void)alertFallback:(NSString *)message {
+  /* We won't use this for now until we have a more robust solution for displaying UIAlertController
   // requires iOS 8
   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
   if (uialertcontrollerClass) {
@@ -772,6 +778,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
     
     [self showAlertController:alertController];
   } else {
+   */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:nil
@@ -787,7 +794,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
     
     [alertView setTag:BITUpdateAlertViewTagNeverEndingAlertView];
     [alertView show];
-  }
+  /*}*/
 }
 
 #pragma mark - RequestComments
@@ -917,6 +924,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
   }
   
 #if TARGET_IPHONE_SIMULATOR
+  /* We won't use this for now until we have a more robust solution for displaying UIAlertController
   // requires iOS 8
   id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
   if (uialertcontrollerClass) {
@@ -932,6 +940,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
     
     [self showAlertController:alertController];
   } else {
+   */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:BITHockeyLocalizedString(@"UpdateWarning")
@@ -941,7 +950,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
                                           otherButtonTitles:nil];
     [alert show];
 #pragma clang diagnostic pop
-  }
+  /*}*/
   return NO;
 
 #else
@@ -1090,7 +1099,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
           versionString = [shortVersionString length] ? [NSString stringWithFormat:@"(%@)", versionString] : versionString;
           NSString *currentVersionString = [NSString stringWithFormat:@"%@ %@ %@%@", self.newestAppVersion.name, BITHockeyLocalizedString(@"UpdateVersion"), shortVersionString, versionString];
           NSString *alertMsg = [NSString stringWithFormat:BITHockeyLocalizedString(@"UpdateNoUpdateAvailableMessage"), currentVersionString];
-          
+          /* We won't use this for now until we have a more robust solution for displaying UIAlertController
           // requires iOS 8
           id uialertcontrollerClass = NSClassFromString(@"UIAlertController");
           if (uialertcontrollerClass) {
@@ -1114,6 +1123,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
             
             [self showAlertController:alertController];
           } else {
+           */
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
             UIAlertView *alert = [[UIAlertView alloc] initWithTitle:BITHockeyLocalizedString(@"UpdateNoUpdateAvailableTitle")
@@ -1123,7 +1133,7 @@ typedef NS_ENUM(NSInteger, BITUpdateAlertViewTag) {
                                                   otherButtonTitles:nil];
             [alert show];
 #pragma clang diagnostic pop
-          }
+          /*}*/
         }
         
         if (self.isUpdateAvailable && (self.alwaysShowUpdateReminder || newVersionDiffersFromCachedVersion || [self hasNewerMandatoryVersion])) {