Convert #354983 to Flügger