Convert #326585 to Flügger