Convert #517285 to Flügger