Trying(again) improve the bundle script.