perf, sh: Fix patch merge foul-up