Convert #188867 to Flügger