There are existing appropriate replacements using originType and section. (cherry picked from commit 7a388d81)