diff --git a/library/init/logic.lean b/library/init/logic.lean
index 43379e7b00..6843e94c52 100644
--- a/library/init/logic.lean
+++ b/library/init/logic.lean
@@ -13,7 +13,6 @@ a
 /- TODO(Leo): for new elaborator
 - Support for partially applied recursors (use eta-expansion)
 - checkpoints when processing calc.
-- heuristic for assigning [elab_with_expected_type] automatically
 -/
 
 /- implication -/
@@ -285,7 +284,6 @@ definition iff (a b : Prop) := (a → b) ∧ (b → a)
 notation a <-> b := iff a b
 notation a ↔ b := iff a b
 
-attribute [elab_with_expected_type]
 theorem iff.intro : (a → b) → (b → a) → (a ↔ b) := and.intro
 
 attribute iff.intro [intro!]
@@ -335,13 +333,11 @@ iff.mp (iff.symm H) trivial
 
 theorem not_of_iff_false : (a ↔ false) → ¬a := iff.mp
 
-attribute [elab_with_expected_type]
 theorem iff_true_intro (H : a) : a ↔ true :=
 iff.intro
   (λ Hl, trivial)
   (λ Hr, H)
 
-attribute [elab_with_expected_type]
 theorem iff_false_intro (H : ¬a) : a ↔ false :=
 iff.intro H (false.rec a)
 
@@ -350,7 +346,6 @@ iff.intro
   (λ (Hl : ¬¬¬a) (Ha : a), Hl (non_contradictory_intro Ha))
   absurd
 
-attribute [congr, elab_with_expected_type]
 theorem imp_congr (H1 : a ↔ c) (H2 : b ↔ d) : (a → b) ↔ (c → d) :=
 iff.intro
   (λHab Hc, iff.mp H2 (Hab (iff.mpr H1 Hc)))
@@ -427,11 +422,10 @@ assume H, iff.mp H trivial
 theorem and.imp (H₂ : a → c) (H₃ : b → d) : a ∧ b → c ∧ d :=
 and.rec (λHa Hb, and.intro (H₂ Ha) (H₃ Hb))
 
-attribute [congr, elab_with_expected_type]
+attribute [congr]
 theorem and_congr (H1 : a ↔ c) (H2 : b ↔ d) : (a ∧ b) ↔ (c ∧ d) :=
 iff.intro (and.imp (iff.mp H1) (iff.mp H2)) (and.imp (iff.mpr H1) (iff.mpr H2))
 
-attribute [elab_with_expected_type]
 theorem and_congr_right (H : a → (b ↔ c)) : (a ∧ b) ↔ (a ∧ c) :=
 iff.intro
   (take Hab, and.intro (and.left Hab) (iff.elim_left (H (and.left Hab)) (and.right Hab)))
@@ -580,7 +574,6 @@ inductive Exists {A : Type} (P : A → Prop) : Prop
 
 attribute Exists.intro [intro]
 
-attribute [elab_with_expected_type]
 definition exists.intro := @Exists.intro
 
 notation `exists` binders `, ` r:(scoped P, Exists P) := r
@@ -624,14 +617,14 @@ exists_unique.elim H
     show y₁ = y₂, from eq.trans (unique _ py₁) (eq.symm (unique _ py₂)))
 
 /- exists, forall, exists unique congruences -/
-attribute [congr, elab_with_expected_type]
+attribute [congr]
 theorem forall_congr {A : Type} {P Q : A → Prop} (H : ∀a, (P a ↔ Q a)) : (∀a, P a) ↔ ∀a, Q a :=
 iff.intro (λp a, iff.mp (H a) (p a)) (λq a, iff.mpr (H a) (q a))
 
 theorem exists_imp_exists {A : Type} {P Q : A → Prop} (H : ∀a, (P a → Q a)) (p : ∃a, P a) : ∃a, Q a :=
 exists.elim p (λa Hp, exists.intro a (H a Hp))
 
-attribute [congr, elab_with_expected_type]
+attribute [congr]
 theorem exists_congr {A : Type} {P Q : A → Prop} (H : ∀a, (P a ↔ Q a)) : (Exists P) ↔ ∃a, Q a :=
 iff.intro
   (exists_imp_exists (λa, iff.mp (H a)))
@@ -659,13 +652,13 @@ is_false not_false
 
 -- We use "dependent" if-then-else to be able to communicate the if-then-else condition
 -- to the branches
-attribute [inline, elab_with_expected_type]
+attribute [inline]
 definition dite (c : Prop) [H : decidable c] {A : Type} : (c → A) → (¬ c → A) → A :=
 λ t e, decidable.rec_on H e t
 
 /- if-then-else -/
 
-attribute [inline, elab_with_expected_type]
+attribute [inline]
 definition ite (c : Prop) [H : decidable c] {A : Type} (t e : A) : A :=
 decidable.rec_on H (λ Hnc, e) (λ Hc, t)
 
diff --git a/library/init/quot.lean b/library/init/quot.lean
index 8cf3cbdd9a..dfe5fcb70f 100644
--- a/library/init/quot.lean
+++ b/library/init/quot.lean
@@ -190,7 +190,7 @@ namespace quot
   end
 end quot
 
-attribute [elab_with_expected_type] quot.mk
+attribute quot.mk
 
 open decidable
 attribute [instance]
diff --git a/src/frontends/lean/elaborator.cpp b/src/frontends/lean/elaborator.cpp
index a62b8fea43..1b944afd9c 100644
--- a/src/frontends/lean/elaborator.cpp
+++ b/src/frontends/lean/elaborator.cpp
@@ -93,11 +93,7 @@ elaborator_strategy get_elaborator_strategy(environment const & env, name const
         return elaborator_strategy::AsEliminator;
     }
 
-    if (inductive::is_intro_rule(env, n)) {
-        return elaborator_strategy::WithExpectedType;
-    }
-
-    return elaborator_strategy::Default;
+    return elaborator_strategy::WithExpectedType;
 }
 
 #define trace_elab(CODE) lean_trace("elaborator", scope_trace_env _scope(m_env, m_ctx); CODE)
@@ -2328,7 +2324,7 @@ void initialize_elaborator() {
             "instructs elaborator that the arguments of the function application (f ...) "
             "should be elaborated from left to right, and without propagating information from the expected type "
             "to its arguments",
-            elaborator_strategy::Default));
+            elaborator_strategy::Simple));
 
     register_incompatible("elab_simple", "elab_with_expected_type");
     register_incompatible("elab_simple", "elab_as_eliminator");
diff --git a/src/frontends/lean/elaborator.h b/src/frontends/lean/elaborator.h
index 5869e870f6..0ef848bc90 100644
--- a/src/frontends/lean/elaborator.h
+++ b/src/frontends/lean/elaborator.h
@@ -14,7 +14,7 @@ Author: Leonardo de Moura
 
 namespace lean {
 enum class elaborator_strategy {
-    Default,
+    Simple,
     WithExpectedType,
     AsEliminator
 };
diff --git a/tests/lean/elab12.lean.expected.out b/tests/lean/elab12.lean.expected.out
index 7f480b04fa..f11932311c 100644
--- a/tests/lean/elab12.lean.expected.out
+++ b/tests/lean/elab12.lean.expected.out
@@ -2,12 +2,9 @@ elab12.lean:1:30: error: type expected at
   0
 elab12.lean:4:42: error: function expected at
   rfl
-elab12.lean:7:44: error: invalid have-expression, expression
-  a + 0
-has type
-  ℕ
-but is expected to have type
-  a = a
+elab12.lean:7:44: error: failed to synthesize type class instance for
+a : ℕ
+⊢ has_add (a = a)
 elab12.lean:11:2: error: function expected at
   H
 λ (a : ℕ), have H : a = a, from rfl, H : ∀ (a : ℕ), a = a