TODO(jjb): test this path
This bug from my commit must mean that we do not have test coverage on this path.