fixup after quantal merge