Fix #6519.
See #6564.