Revert bundler changes in 73f23bf4c643637c805e4911648aea16f8a73c55