Patch rebased for r117003.