Fix stupid image bug

In dealing with one regression I caused another.

Change-Id: Ib98adfcefaad6fa3491ae3cd78a7a8bc6836c7fd
Merge "Fix stupid image bug"