Change to deal with non-backwards-compatible changes in UIFR-104