Convert #228377 to Flügger