This fixes #7486.