Convert #228779 to Flügger