Reverting Bootstrap to ServiceLocator temporarily