Convert #348584 to Flügger