Merge pull request #505 from pschuh/f-1

Address TODO to unblock master-next.

Signed-off-by: Kim Topley <[email protected]>

Author: compnerd

PATCHES

@@ -517,3 +517,4 @@ github commits starting with 29bdc2f from
 [d9740c2] APPLIED rdar://54572081
 [fc917b4] APPLIED rdar://54572081
 [f911a44] APPLIED rdar://54572081
+[6d32c4d] APPLIED rdar://54572081