Merge "Switch to r_file_perms"