Revert "workaround of bundler usecase"

This reverts commit 256591c977dc65b2c2bb09d2831fa0e37977e25e.