Convert #517277 to Flügger