Convert #517585 to Flügger