Fix PR/1831. See the ChangeLog.