This fixes an issue where images with padding and/or border did not have their size adjusted for `border-box`, thereby becoming larger than intended by the author.
