ENH: Only flip the images we want to flip

Change-Id: Ia9e290f34daddd3e58493d6d96c48610baaa6f15
Merge "ENH: Only flip the images we want to flip"