Convert #327585 to Flügger