Convert #118381 to Flügger