From c2e52ea31330c3c9c0921aa6440bf1773cd48731 Mon Sep 17 00:00:00 2001
From: "Pan, Xinlei (Ryan)" <xinleiryan.pan@verizonwireless.com>
Date: Wed, 8 Apr 2020 11:51:14 -0400
Subject: [PATCH] Revert "Merge branch 'feature/usenewfont' into 'develop'"

This reverts merge request !353
---
 MVMCoreUI/Utility/MFFonts.m | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/MVMCoreUI/Utility/MFFonts.m b/MVMCoreUI/Utility/MFFonts.m
index 24c62a9a..533b3a87 100644
--- a/MVMCoreUI/Utility/MFFonts.m
+++ b/MVMCoreUI/Utility/MFFonts.m
@@ -85,20 +85,14 @@ NSString * const DS55Rg = @"NHaasGroteskDSStd-55Rg";
 
 + (nonnull UIFont *)mfFont75Bd:(CGFloat)size {
     [self loadMVMFonts];
-    if (size >= 15) {
-        return [MFFonts mfFontDSBold:size];
-    } else {
-        return [MFFonts mfFontTXBold:size];
-    }
+    UIFont *font = [UIFont fontWithName:DS75Bd size:size];
+    return font ?: [UIFont boldSystemFontOfSize:size];
 }
 
 + (nonnull UIFont *)mfFont55Rg:(CGFloat)size {
     [self loadMVMFonts];
-    if (size >= 15) {
-        return [MFFonts mfFontDSRegular:size];
-    } else {
-        return [MFFonts mfFontTXRegular:size];
-    }
+    UIFont *font = [UIFont fontWithName:DS55Rg size:size];
+    return font ?: [UIFont systemFontOfSize:size];
 }
 
 + (nullable UIFont *)mfFontOcratxt:(CGFloat)size {