diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eda1061497bd..2b957549157e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/88483
+	* config/i386/i386.c (ix86_finalize_stack_frame_flags): Revert
+	reversion 267133.
+
 2018-12-15  Jan Hubicka  <hubicka@ucw.cz>
 
 	* ipa-fnsummary.c (analyze_function_body): Do not loeak conds and
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index b6dea0c061d7..4ba23618afe2 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -12879,6 +12879,7 @@ ix86_finalize_stack_frame_flags (void)
 	   && flag_exceptions
 	   && cfun->can_throw_non_call_exceptions)
       && !ix86_frame_pointer_required ()
+      && get_frame_size () == 0
       && ix86_nsaved_sseregs () == 0
       && ix86_varargs_gpr_size + ix86_varargs_fpr_size == 0)
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 597ba50c867a..d7ca87718ef4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/88483
+	* gcc.target/i386/stackalign/pr88483.c: Removed.  Revert
+	reversion 267133.
+
 2018-12-15  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/87944
diff --git a/gcc/testsuite/gcc.target/i386/stackalign/pr88483.c b/gcc/testsuite/gcc.target/i386/stackalign/pr88483.c
deleted file mode 100644
index 5aec8fd4cf69..000000000000
--- a/gcc/testsuite/gcc.target/i386/stackalign/pr88483.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O2 -mavx2" } */
-
-struct B
-{
-  char a[12];
-  int b;
-};
-
-struct B
-f2 (void)
-{
-  struct B x = {};
-  return x;
-}
-
-/* { dg-final { scan-assembler-not "and\[lq\]?\[^\\n\]*-\[0-9\]+,\[^\\n\]*sp" } } */