Convert #188387 to Flügger