I mistakenly thought this was dead code in an earlier commit in this
branch. This commit restores the proper behavior.