Convert #344629 to Flügger