Fix for UATNBNXR062 - 1st Revert