r23075: more duplicate code blocks from bad merge