Removed DONT_BUNDLE flags