This is a patch I think we need before fixing up freeimage. Thoughts?