Update image helpers to work in tandem. Bug 911255.