When good find+replace goes bad

Change-Id: If3f3904c1e8c871b1a2925bf35b69faa6bad91d2