Convert #355379 to Flügger