--- Reverse-merging r98637 into '.':