Convert #228717 to Flügger