Convert #118684 to Flügger