Symlinks not respected

I am running into the same issue as #560 The above issue was closed because nobody cared apparently. Hopefully this time someone will care.