Merge "Revert "Set up crypto for user directories in init.""