fixup! Bug #6539 (mistaken deletion)