There are existing appropriate replacements using originType and section.
mentioned in commit 362abdc2