r7581: fix bad merge