Revert "Fix for UATNBNXR0015"

This reverts commit 2b0167d4fa99a6a541d6fbf3684c71114a34e410.