Merge "Change user 0 directory back for compatibility"