This was from issue #6765