Fixes #6096.

Cannot let that get to next dev-freeze.