Adding COMBINE_HIDPI_IMAGES again to keep Xcode from nagging us.