Fix regression with unagi builds