Convert #291338 to Flügger