The math wrapper handling is going to be replaced shortly and d1705c11 was actually a precursor for that.