Do we want to add tests for this logic?  I don't see any.