Convert #329615 to Flügger