Convert #228579 to Flügger