Downstream bug fixed and we can remove workaround
Downstream bug fixed and we can remove workaround

NekR/webpack,EliteScientist/webpack,SimenB/webpack,NekR/webpack,webpack/webpack,webpack/webpack,webpack/webpack,EliteScientist/webpack,SimenB/webpack,SimenB/webpack,webpack/webpack,SimenB/webpack