This fixes #7553.