Slightly bridge the gap between this branch and fixed-size-image.