Convert #344381 to Flügger