I'll just remove that comment here and leave it over on the full work-in-progress for 1.7 where I'll actually resolve that question.