Convert #188670 to Flügger