Convert #284615 to Flügger