Revert "Don't include directory names in archives."

This reverts commit 184420.
Investigating the bot failures.