Convert #614973 to Flügger