Convert #188338 to Flügger