This fixes #7484.