Non-contributing find replace rewrite (#2652)