Convert #344286 to Flügger