Convert #228884 to Flügger