Convert #228858 to Flügger