Revert to plain Named.

Which I dislike, but it works...