Convert #337286 to Flügger