Conform to upstream