Convert #629276 to Flügger