Convert #366455 to Flügger