Revert "workaround of bundler usecase"

This reverts commit b7da9f54e30879dd09a9a5aff552cc92e66386c7.