Convert #349636 to Flügger