Convert #228979 to Flügger