             } else {
                 WMFAlertManager.sharedInstance.dismissAlert()
             }
-
-            self.setWikitext(revision) { (error) in
-                if let error = error {
-                    assertionFailure(error.localizedDescription)
-                } else {
-                    DispatchQueue.main.async {
-                        self.webView.focus()
-                        // TODO: Remove
-                        self.progressButton.isEnabled = true
-                    }
-                }
+            DispatchQueue.main.async {
+                self.wikitext = revision
             }
         case .FETCH_FINAL_STATUS_CANCELLED:
             fallthrough

        messagingController.buttonSelectionDelegate = self
        let setupUserScript = CodemirrorSetupUserScript(language: language, theme: theme) { [weak self] in
            webViewCoverView.removeFromSuperview()
            self?.loadWikitext()
        }
        
        contentController.addUserScript(setupUserScript)


    override func viewDidLoad() {
        super.viewDidLoad()
        loadWikitext()

        configureNavigationButtonItems()
        configureWebView()

