Upstream added this