Convert #228787 to Flügger