This fixes #7724.