Reapply r207135 without modifications.