Finally cleaned up the fallback image handling

We now correctly handle the situation where the hi-res image of the data
isn't available.