Convert #228897 to Flügger