This fixes #8342.