undo this: ImageDimension moved to its own class.
(cherry picked from commit 91d588fa80092a38801da8eeeb9c145b834bd855)