Revert Thirteen Fish's revert, fix permissions