Convert #613294 to Flügger