This is covered by the other fix I merged yesterday, so this patch can be reduced to the symlink fix