Don't bundle unless necessary

@markijbema review?