mario.patch

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
index 8b48004bf8..5bea84f858 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
@@ -574,6 +574,8 @@ public class PostUploadHandler implements UploadHandler<PostModel> {
             String errorMessage = mUiHelpers.getTextOfUiString(context,
                     UploadUtils.getErrorMessageResIdFromPostError(event.post.isPage(), event.error));
             String notificationMessage = UploadUtils.getErrorMessage(context, event.post, errorMessage, false);
+            mPostUploadNotifier.removePostInfoFromForegroundNotification(event.post,
+                    mMediaStore.getMediaForPost(event.post));
             mPostUploadNotifier.incrementUploadedPostCountFromForegroundNotification(event.post);
             mPostUploadNotifier.updateNotificationErrorForPost(event.post, site, notificationMessage, 0);
             sFirstPublishPosts.remove(event.post.getId());
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java
index 71ec7531eb..87ef560538 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java
@@ -249,10 +249,7 @@ public class UploadService extends Service {
                         return;
                     }
                     boolean postHasGutenbergBlocks = PostUtils.contentContainsGutenbergBlocks(post.getContent());
-                    boolean processWithAztec =
-                            AppPrefs.isAztecEditorEnabled() && !AppPrefs.isGutenbergEditorEnabled()
-                            && !postHasGutenbergBlocks;
-                    retryUpload(post, processWithAztec);
+                    retryUpload(post, !postHasGutenbergBlocks);
                 } else {
                     ToastUtils.showToast(this, R.string.retry_needs_aztec);
                 }