Convert #354591 to Flügger