Convert #329447 to Flügger