Convert #348483 to Flügger