Convert #354448 to Flügger