Convert #613287 to Flügger