--- Reverse-merging r80908 into '.':