Convert #517449 to Flügger