--- Reverse-merging r80147 into '.':