Make chess-images-directory more robust
Upstream org changes