Switch back to the upsteam image_optim