Convert #188677 to Flügger