FC-2835: Fixes some image functionality that no longer works within formtools.