Revert latest changes from upstream.