diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 27176b350a..819b478b98 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2993,16 +2993,8 @@ void BufferView::caretPosAndHeight(Point & p, int & h) const
 	Cursor const & cur = cursor();
 	Font const font = cur.real_current_font;
 	frontend::FontMetrics const & fm = theFontMetrics(font);
-	int asc = fm.maxAscent();
-	int des = fm.maxDescent();
-	// If the cursor is in mathed and it has cached metrics, reduce
-	// the height to fit the inner cell (mathed cells are tight
-	// vertically).
-	if (cur.inMathed() && coordCache().getArrays().hasDim(&cur.cell())) {
-		Dimension const dim = cur.cell().dimension(*this);
-		asc = min(asc, dim.asc);
-		des = min(des, dim.des);
-	}
+	int const asc = fm.maxAscent();
+	int const des = fm.maxDescent();
 	h = asc + des;
 	p = getPos(cur);
 	p.y_ -= asc;
diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index 96aef29491..d242a86f72 100644
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -261,15 +261,6 @@ bool isInside(DocIterator const & it, MathData const & ar,
 
 void MathData::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	// This is the only point where the drawing font is known.
-	// We set cursor current font so that the blinking caret height
-	// adapts to math font.
-	Cursor & cur = mi.base.bv->cursor();
-	if (cur.inMathed() && &cur.cell() == this) {
-		cur.current_font.fontInfo() = mi.base.font;
-		cur.real_current_font.fontInfo() = mi.base.font;
-	}
-
 	frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
 	dim = fm.dimension('I');
 	int xascent = fm.dimension('x').ascent();