Revert no_avatar changes