diff --git a/compiler/rustc_mir/src/transform/remove_zsts.rs b/compiler/rustc_mir/src/transform/remove_zsts.rs
index 5b1dcba670437..4c9dc43df9b57 100644
--- a/compiler/rustc_mir/src/transform/remove_zsts.rs
+++ b/compiler/rustc_mir/src/transform/remove_zsts.rs
@@ -16,7 +16,7 @@ impl<'tcx> MirPass<'tcx> for RemoveZsts {
                     StatementKind::Assign(box (place, _)) => {
                         let place_ty = place.ty(local_decls, tcx).ty;
                         if let Ok(layout) = tcx.layout_of(param_env.and(place_ty)) {
-                            if layout.is_zst() && !layout.abi.is_uninhabited() {
+                            if layout.is_zst() {
                                 if tcx.consider_optimizing(|| {
                                     format!(
                                         "RemoveZsts - Place: {:?} SourceInfo: {:?}",
diff --git a/src/test/ui/consts/const-eval/panic-assoc-never-type.rs b/src/test/ui/consts/const-eval/panic-assoc-never-type.rs
index f76440298b3ca..85425324eec04 100644
--- a/src/test/ui/consts/const-eval/panic-assoc-never-type.rs
+++ b/src/test/ui/consts/const-eval/panic-assoc-never-type.rs
@@ -15,5 +15,5 @@ impl PrintName {
 
 fn main() {
     let _ = PrintName::VOID;
-    //~^ ERROR erroneous constant used
+    //~^ ERROR erroneous constant encountered
 }
diff --git a/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr b/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
index 28a3ebede5038..5495a2a0121f7 100644
--- a/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
+++ b/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
@@ -15,12 +15,11 @@ LL | #![warn(const_err)]
    = note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
    = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0080]: erroneous constant used
+error: erroneous constant encountered
   --> $DIR/panic-assoc-never-type.rs:17:13
    |
 LL |     let _ = PrintName::VOID;
-   |             ^^^^^^^^^^^^^^^ referenced constant has errors
+   |             ^^^^^^^^^^^^^^^
 
 error: aborting due to previous error; 1 warning emitted
 
-For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-eval/panic-never-type.rs b/src/test/ui/consts/const-eval/panic-never-type.rs
index c5139c575b15f..0283b94f76d73 100644
--- a/src/test/ui/consts/const-eval/panic-never-type.rs
+++ b/src/test/ui/consts/const-eval/panic-never-type.rs
@@ -11,5 +11,5 @@ const VOID: ! = panic!();
 
 fn main() {
     let _ = VOID;
-    //~^ ERROR erroneous constant used
+    //~^ ERROR erroneous constant encountered
 }
diff --git a/src/test/ui/consts/const-eval/panic-never-type.stderr b/src/test/ui/consts/const-eval/panic-never-type.stderr
index 8f67dd6a8ba42..d8f68f530fc94 100644
--- a/src/test/ui/consts/const-eval/panic-never-type.stderr
+++ b/src/test/ui/consts/const-eval/panic-never-type.stderr
@@ -15,12 +15,11 @@ LL | #![warn(const_err)]
    = note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
    = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0080]: erroneous constant used
+error: erroneous constant encountered
   --> $DIR/panic-never-type.rs:13:13
    |
 LL |     let _ = VOID;
-   |             ^^^^ referenced constant has errors
+   |             ^^^^
 
 error: aborting due to previous error; 1 warning emitted
 
-For more information about this error, try `rustc --explain E0080`.