Fixes #7113.

The dev version.