This fixes #8329.