Convert #438429 to Flügger