Convert #335867 to Flügger