Convert #228849 to Flügger