Back out previous change, and fix staging bundle_without