Convert #329393 to Flügger