Somehow I was unable to see that the code did not actually do what I
thought (and documented) it would do.

Fixes #2470