Convert #335787 to Flügger