Hand-apply 22ff18bc9fb57419cbc81da553effd59638b488f from master; fix broken still image support.