This reverts commit e068fa393e0acc19d4ddabe5d6a8a123db2cfcfd. Zuul-launcher doesn't deal well with deleting providers while images are present. Let's do this in multiple steps. Change-Id: I7457a366eb87a6ca89d8b7fe885cc9efa7c15721