Convert #228249 to Flügger