Fix for UATNBNXR012 - 2nd Revert