Convert #335074 to Flügger