Convert #371288 to Flügger