Convert #307897 to Flügger