Commiting Progress of effort to re-enable bundle downloading/swapping.