Convert #228682 to Flügger