Remove bundle optimization again