Convert #118426 to Flügger