Convert #350348 to Flügger