Revert part of the previous change to correct image handling.

Previous change indirectly resulted in figures being copied to
images/figures instead of images.