Reverting image name to be non-mandatory as a workaround for bug 470

No match.