Revert "[FIX] W0621(redefined-outer-name)"

This reverts commit 6c3e93d4f058e22d40156958e5cfd87387f5d111.