Convert #329287 to Flügger