[aoe] Fix search'n'replace failures for recent commits