Fix for UATNBNXR043 - 2nd Revert