Convert #344296 to Flügger