Fix a double-correction that would mess up images where width=NULL/height=NULL.