Removed the image performance hack