Revert 801cb60..d432703

This rolls back to commit 801cb60924c231b5517558af5a47cc899c16570f.
Prevent rehashing of filenames