Revert "Make sure that names of all entries have the same encoding."

This reverts commit 6a7f4bb79dde575d30af562af916b572b80ff9c3.

Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
2 files changed