Removed MKL hack again, which was added by mistake in previous merge