#942 was a bug fix, not an enhancement.

[ci skip]