Revert 3 revert 2 snyk fix 5fa8250504177f119e21fdd142c625c5

[nanaroclassic]

trafficstars

Thanks for proposing a pull request!

To help us review the request, please complete the following:

• [x] sign contributor license agreement
• [x] I've ensured that all existing tests pass and added tests (when/where necessary)
• [x] I've updated the documentation (when/where necessary) and Changelog (when/where necessary)
• [x] I've added the proper label to this pull request (e.g. bug for bug fixes)

Pull Request Details

Describe what you accomplished in this pull request (for example, what happens before the change, and after the change)

Test Plan

Test Plan: Add your test plan here