Convert #436447 to Flügger