looks like we no longer need those hacks for bundler!