Fix for UATNBNXR0026 - 1st Revert (Part 2)