--- Reverse-merging r82282 into '.':