Rolled back couple of image related changes