Switch back to user_picture and drop field_user_pic