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

For more info: https://farcry.jira.com/browse/FC-2835