I don't think you can change this because there is still one case where we call this function after findByPhoneNumber