Update to r40772.