Convert #228251 to Flügger