Convert #629317 to Flügger