Convert #319228 to Flügger