Revert "Permissions cleanup"

This reverts commit 2a050ea8968c6e2cb2d1283b2c9832fec95d0b36.
Revert "Working around locale issues"

This reverts commit ab5070de9cbc33a8a707250d884abb0d6c9066e7.