Backport fix for image class dependencies

No match.