This fixes #7883.