Remove small changes pushed upstream.

\cc @bgilbert