Container rollback

From 270004T8GY 270004T8GY