Convert #188438 to Flügger