There are more issues than this, but hopefully this is enough to get make test-bundler passing in CI.