Reverted ba7b5ecd91fbb53f37172177282d3835f6944292
as it completely broke listings (dupes, inability to remove directory)