Use yat from upstream again