Convert #438228 to Flügger