Convert #350486 to Flügger