Add scaled/rotated image support back