Add changes from r75479 back in.