This fixes #7963.