Changes per #3659 review