--- Reverse-merging r79938 into '.':