Simplify ModifyImageAttributes

/cc @jmassara - I think this is much simpler. Thoughts?