diff --git a/platform/platform-impl/src/com/intellij/ui/layout/flags.kt b/platform/platform-impl/src/com/intellij/ui/layout/flags.kt
index c5f3f3fde6c5..b9d0f068e7ad 100644
--- a/platform/platform-impl/src/com/intellij/ui/layout/flags.kt
+++ b/platform/platform-impl/src/com/intellij/ui/layout/flags.kt
@@ -26,9 +26,6 @@ enum class LCFlags {
    */
   fill, fillX, fillY,
 
-  // temp flag, will be removed or renamed later
-  disableMagic,
-
   lcWrap,
 
   debug
diff --git a/platform/platform-impl/src/com/intellij/ui/layout/layout.kt b/platform/platform-impl/src/com/intellij/ui/layout/layout.kt
index 4c6ae890882e..100f9dd85afd 100644
--- a/platform/platform-impl/src/com/intellij/ui/layout/layout.kt
+++ b/platform/platform-impl/src/com/intellij/ui/layout/layout.kt
@@ -17,7 +17,7 @@ import com.intellij.ui.components.DialogPanel
  * `ToolbarDecorator` and `JBScrollPane` (use [Row.scrollPane]) components automatically have [Row.grow] and [Row.push].
  */
 inline fun panel(vararg constraints: LCFlags, title: String? = null, init: LayoutBuilder.() -> Unit): DialogPanel {
-  val builder = createLayoutBuilder(isUseMagic = !constraints.contains(LCFlags.disableMagic))
+  val builder = createLayoutBuilder()
   builder.init()
 
   val panel = DialogPanel(title, layout = null)
diff --git a/platform/platform-impl/src/com/intellij/ui/layout/layoutImpl.kt b/platform/platform-impl/src/com/intellij/ui/layout/layoutImpl.kt
index 6d3cc37c0ea3..f1633d3c9107 100644
--- a/platform/platform-impl/src/com/intellij/ui/layout/layoutImpl.kt
+++ b/platform/platform-impl/src/com/intellij/ui/layout/layoutImpl.kt
@@ -9,8 +9,8 @@ import javax.swing.JComponent
 
 @PublishedApi
 @JvmOverloads
-internal fun createLayoutBuilder(isUseMagic: Boolean = true): LayoutBuilder {
-  return LayoutBuilder(MigLayoutBuilder(createIntelliJSpacingConfiguration(), isUseMagic = isUseMagic))
+internal fun createLayoutBuilder(isUseMagic: Boolean = true /* preserved for API compatibility */): LayoutBuilder {
+  return LayoutBuilder(MigLayoutBuilder(createIntelliJSpacingConfiguration()))
 }
 
 interface LayoutBuilderImpl {
diff --git a/platform/platform-impl/src/com/intellij/ui/layout/migLayout/MigLayoutBuilder.kt b/platform/platform-impl/src/com/intellij/ui/layout/migLayout/MigLayoutBuilder.kt
index a0434c7f935d..0281590f449a 100644
--- a/platform/platform-impl/src/com/intellij/ui/layout/migLayout/MigLayoutBuilder.kt
+++ b/platform/platform-impl/src/com/intellij/ui/layout/migLayout/MigLayoutBuilder.kt
@@ -13,10 +13,7 @@ import java.awt.Container
 import javax.swing.ButtonGroup
 import javax.swing.JComponent
 
-internal class MigLayoutBuilder(
-  val spacing: SpacingConfiguration,
-  val isUseMagic: Boolean = true
-) : LayoutBuilderImpl {
+internal class MigLayoutBuilder(val spacing: SpacingConfiguration) : LayoutBuilderImpl {
   companion object {
     private var hRelatedGap = -1
     private var vRelatedGap = -1
@@ -188,7 +185,7 @@ internal class MigLayoutBuilder(
           }
           // if constraint specified only for rows 0 and 1, MigLayout will use constraint 1 for any rows with index 1+ (see LayoutUtil.getIndexSafe - use last element if index > size)
           // so, we set for each row to make sure that constraints from previous row will be not applied
-          rowConstraints.align(if (isUseMagic) "baseline" else "top", rowIndex)
+          rowConstraints.align("baseline", rowIndex)
         }
 
         if (index >= row.rightIndex) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
index f05143ed1575..b757801468ab 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
@@ -134,7 +134,7 @@ open class MultipleFileMergeDialog(
   }
 
   override fun createCenterPanel(): JComponent {
-    return panel(LCFlags.disableMagic) {
+    return panel {
       row {
         descriptionLabel()
       }