Prereq: fixes #885.
Merge pull request #902 from afred/deprecate-no-image-796

undo copy-and-paste