Convert #188381 to Flügger