Convert #354604 to Flügger