Merge #11633 At least 2 people prefer earlier revision.