Update per discussion on bfb17a2fb53f3924cfaee2a271cb8be036cbae62