removed comments to match upstream