reverted AvatarUploader change; test failed