Revert accidentally merged topic.

I assumed, but apparently didn't test, that dev/string-apis had been
through next already.
Merge topic 'target-SOURCES-refactor' into next

639bf2c1 Revert accidentally merged topic.