!str #15964 Remove dependency to persistence

* It will show up again in the right place, in enhanced form, by #16541